lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-04 08:02:28 +03:00
Code Activity

Guard the macro definition

Browse Source 
It doesn't make sense to define a macro expanding to a non-existent function.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine
2023-11-23 14:12:29 +01:00
parent 15d32bb60f
commit 61a852216e
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
scripts/mbedtls_dev/c_wrapper_generator.py
View File

@ -277,21 +277,16 @@ extern "C" {{
if wrapper.guard is not None: if wrapper.guard is not None:
out.write('#endif /* {} */\n'.format(wrapper.guard)) out.write('#endif /* {} */\n'.format(wrapper.guard))
def _write_h_function(self, out: typing_util.Writable, def _write_h_function_declaration(self, out: typing_util.Writable,
function: FunctionInfo, function: FunctionInfo,
wrapper: WrapperInfo) -> None: wrapper: WrapperInfo) -> None:
"""Write the declaration of one wrapper function. """Write the declaration of one wrapper function.
""" """
out.write('\n')
if wrapper.guard is not None:
out.write('#if {}\n'.format(wrapper.guard))
self._write_function_prototype(out, function, wrapper, True) self._write_function_prototype(out, function, wrapper, True)
if wrapper.guard is not None:
out.write('#endif /* {} */\n'.format(wrapper.guard))
def _write_h_macro(self, out: typing_util.Writable, def _write_h_macro_definition(self, out: typing_util.Writable,
function: FunctionInfo, function: FunctionInfo,
wrapper: WrapperInfo) -> None: wrapper: WrapperInfo) -> None:
"""Write the macro definition for one wrapper. """Write the macro definition for one wrapper.
""" """
arg_list = ', '.join(wrapper.argument_names) arg_list = ', '.join(wrapper.argument_names)
@ -300,6 +295,26 @@ extern "C" {{
wrapper_name=wrapper.wrapper_name, wrapper_name=wrapper.wrapper_name,
args=arg_list)) args=arg_list))
def _write_h_function(self, out: typing_util.Writable,
function: FunctionInfo) -> None:
"""Write the complete header content for one wrapper.
This is the declaration of the wrapper function, and the
definition of a function-like macro that calls the wrapper function.
Do nothing if the function is skipped.
"""
wrapper = self._wrapper_info(function)
if wrapper is None:
return
out.write('\n')
if wrapper.guard is not None:
out.write('#if {}\n'.format(wrapper.guard))
self._write_h_function_declaration(out, function, wrapper)
self._write_h_macro_definition(out, function, wrapper)
if wrapper.guard is not None:
out.write('#endif /* {} */\n'.format(wrapper.guard))
def write_c_file(self, filename: str) -> None: def write_c_file(self, filename: str) -> None:
"""Output a whole C file containing function wrapper definitions.""" """Output a whole C file containing function wrapper definitions."""
with open(filename, 'w', encoding='utf-8') as out: with open(filename, 'w', encoding='utf-8') as out:
@ -319,13 +334,8 @@ extern "C" {{
self.header_guard = self._header_guard_from_file_name(filename) self.header_guard = self._header_guard_from_file_name(filename)
with open(filename, 'w', encoding='utf-8') as out: with open(filename, 'w', encoding='utf-8') as out:
self._write_prologue(out, True) self._write_prologue(out, True)
for name in sorted(self.functions.keys()): for name in sorted(self.functions):
function = self.functions[name] self._write_h_function(out, self.functions[name])
wrapper = self._wrapper_info(function)
if wrapper is None:
continue
self._write_h_function(out, function, wrapper)
self._write_h_macro(out, function, wrapper)
self._write_epilogue(out, True) self._write_epilogue(out, True)