lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-05-27 05:21:06 +03:00
Code

Merge pull request #6877 from davidhorstmann-arm/2.28-disable-code-style-for-bn-asm

Browse Source 
[Backport 2.28] Check for Uncrustify errors in `code_style.py`
This commit is contained in:
Gilles Peskine 2023-01-05 14:35:11 +01:00 committed by GitHub
commit e4627f34da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/mbedtls/bn_mul.h
View File

@ -84,13 +84,12 @@
#endif /* bits in mbedtls_mpi_uint */
/* *INDENT-OFF* */
#if defined(MBEDTLS_HAVE_ASM)
/* *INDENT-OFF* */
#ifndef asm
#define asm __asm
#endif
/* *INDENT-ON* */
/* armcc5 --gnu defines __GNUC__ but doesn't support GNU's extended asm */
#if defined(__GNUC__) && \
@ -1003,4 +1002,5 @@
#endif /* C (generic) */
#endif /* C (longlong) */
/* *INDENT-ON* */
#endif /* bn_mul.h */

24
scripts/code_style.py
View File

@ -106,8 +106,12 @@ def check_style_is_correct(src_file_list: List[str]) -> bool:
style_correct = True
for src_file in src_file_list:
uncrustify_cmd = [UNCRUSTIFY_EXE] + UNCRUSTIFY_ARGS + [src_file]
subprocess.run(uncrustify_cmd, stdout=subprocess.PIPE, \
result = subprocess.run(uncrustify_cmd, stdout=subprocess.PIPE, \
stderr=subprocess.PIPE, check=False)
if result.returncode != 0:
print_err("Uncrustify returned " + str(result.returncode) + \
" correcting file " + src_file)
return False
# Uncrustify makes changes to the code and places the result in a new
# file with the extension ".uncrustify". To get the changes (if any)
@ -128,22 +132,30 @@ def check_style_is_correct(src_file_list: List[str]) -> bool:
return style_correct
def fix_style_single_pass(src_file_list: List[str]) -> None:
def fix_style_single_pass(src_file_list: List[str]) -> bool:
"""
Run Uncrustify once over the source files.
"""
code_change_args = UNCRUSTIFY_ARGS + ["--no-backup"]
for src_file in src_file_list:
uncrustify_cmd = [UNCRUSTIFY_EXE] + code_change_args + [src_file]
subprocess.run(uncrustify_cmd, check=False, stdout=STDOUT_UTF8, \
stderr=STDERR_UTF8)
result = subprocess.run(uncrustify_cmd, check=False, \
stdout=STDOUT_UTF8, stderr=STDERR_UTF8)
if result.returncode != 0:
print_err("Uncrustify with file returned: " + \
str(result.returncode) + " correcting file " + \
src_file)
return False
return True
def fix_style(src_file_list: List[str]) -> int:
"""
Fix the code style. This takes 2 passes of Uncrustify.
"""
fix_style_single_pass(src_file_list)
fix_style_single_pass(src_file_list)
if not fix_style_single_pass(src_file_list):
return 1
if not fix_style_single_pass(src_file_list):
return 1
# Guard against future changes that cause the codebase to require
# more passes.