yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use helper function for error printing

Browse source 
Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann 2022-12-08 14:33:52 +00:00
parent b7dab41315
commit ca13c4f59f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/code_style.py
View file

@ -28,6 +28,9 @@ UNCRUSTIFY_ARGS = ["-c", CONFIG_FILE]
STDOUT_UTF8 = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8') STDOUT_UTF8 = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8')
STDERR_UTF8 = io.TextIOWrapper(sys.stderr.buffer, encoding='utf-8') STDERR_UTF8 = io.TextIOWrapper(sys.stderr.buffer, encoding='utf-8')
def print_err(*args):
print("Error: ", *args, file=STDERR_UTF8)
def get_src_files() -> List[str]: def get_src_files() -> List[str]:
""" """
Use git ls-files to get a list of the source files Use git ls-files to get a list of the source files
@ -41,8 +44,7 @@ def get_src_files() -> List[str]:
stderr=STDERR_UTF8, check=False) stderr=STDERR_UTF8, check=False)
if result.returncode != 0: if result.returncode != 0:
print("Error: git ls-files returned: "+str(result.returncode), \ print_err("git ls-files returned: "+str(result.returncode))
file=STDERR_UTF8)
return [] return []
else: else:
src_files = str(result.stdout, "utf-8").split() src_files = str(result.stdout, "utf-8").split()
@ -59,8 +61,7 @@ def get_uncrustify_version() -> str:
result = subprocess.run([UNCRUSTIFY_EXE, "--version"], \ result = subprocess.run([UNCRUSTIFY_EXE, "--version"], \
stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False) stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False)
if result.returncode != 0: if result.returncode != 0:
print("Error getting version: "+str(result.stderr, "utf-8"), \ print_err("Could not get Uncrustify version:", str(result.stderr, "utf-8"))
file=STDERR_UTF8)
return "" return ""
else: else:
return str(result.stdout, "utf-8") return str(result.stdout, "utf-8")
@ -115,8 +116,7 @@ def fix_style(src_file_list: List[str]) -> int:
# Guard against future changes that cause the codebase to require # Guard against future changes that cause the codebase to require
# more passes. # more passes.
if not check_style_is_correct(src_file_list): if not check_style_is_correct(src_file_list):
print("Error: Code style still incorrect after second run of Uncrustify.", \ print("Code style still incorrect after second run of Uncrustify.")
file=STDERR_UTF8)
return 1 return 1
else: else:
return 0 return 0