Fixes for CodeQL requirements

Made function implementations exactly match their definitions Changed function parameter names to prevent any possible shadowing of static variables Signed-off-by: Martijn Reicher <[email protected]>
eclipse-cyclonedds · Jul 6, 2023 · 6554fb0 · 6554fb0
1 parent d44075c
commit 6554fb0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/src/tools/idlc/include/libidlc/descriptor_type_meta.h b/src/tools/idlc/include/libidlc/descriptor_type_meta.h
@@ -17,12 +17,12 @@
 IDLC_EXPORT idl_retcode_t
 print_type_meta_ser (
   FILE *fp,
-  const idl_pstate_t *pstate,
+  const idl_pstate_t *state,
   const idl_node_t *node);
 
 IDLC_EXPORT idl_retcode_t
 generate_type_meta_ser (
-  const idl_pstate_t *pstate,
+  const idl_pstate_t *state,
   const idl_node_t *node,
   idl_typeinfo_typemap_t *result);
 

diff --git a/src/tools/idlc/include/libidlc/generator.h b/src/tools/idlc/include/libidlc/generator.h
@@ -33,10 +33,10 @@ IDLC_EXPORT const idlc_option_t**
 generator_options(void);
 
 IDLC_EXPORT int
-print_type(char *str, size_t len, const void *ptr, void *user_data);
+print_type(char *str, size_t size, const void *ptr, void *user_data);
 
 IDLC_EXPORT int
-print_scoped_name(char *str, size_t len, const void *ptr, void *user_data);
+print_scoped_name(char *str, size_t size, const void *ptr, void *user_data);
 
 #if defined(__cplusplus)
 }

diff --git a/src/tools/idlc/src/descriptor_type_meta.c b/src/tools/idlc/src/descriptor_type_meta.c
@@ -1798,7 +1798,7 @@ generate_type_meta_ser_impl (
 idl_retcode_t
 print_type_meta_ser (
   FILE *fp,
-  const idl_pstate_t *pstate,
+  const idl_pstate_t *state,
   const idl_node_t *node)
 {
   struct DDS_XTypes_TypeInformation type_information;
@@ -1810,7 +1810,7 @@ print_type_meta_ser (
   if (IDL_PRINTA(&type_name, print_type, node) < 0)
     return IDL_RETCODE_NO_MEMORY;
 
-  if ((rc = generate_type_meta_ser_impl (pstate, node, &type_information, &os_typeinfo, &os_typemap)))
+  if ((rc = generate_type_meta_ser_impl (state, node, &type_information, &os_typeinfo, &os_typemap)))
     return rc;
 
   if ((rc = print_typeinformation_comment (fp, &type_information)) != IDL_RETCODE_OK)
@@ -1827,7 +1827,7 @@ print_type_meta_ser (
 
 idl_retcode_t
 generate_type_meta_ser (
-  const idl_pstate_t *pstate,
+  const idl_pstate_t *state,
   const idl_node_t *node,
   idl_typeinfo_typemap_t *result)
 {
@@ -1836,7 +1836,7 @@ generate_type_meta_ser (
   dds_ostream_t os_typemap;
   idl_retcode_t rc;
 
-  if ((rc = generate_type_meta_ser_impl (pstate, node, &type_information, &os_typeinfo, &os_typemap)))
+  if ((rc = generate_type_meta_ser_impl (state, node, &type_information, &os_typeinfo, &os_typemap)))
     return rc;
 
   result->typeinfo = NULL;

diff --git a/src/tools/idlc/src/generator.c b/src/tools/idlc/src/generator.c
@@ -198,8 +198,7 @@ static int print_decl_type(
   return (int)len;
 }
 
-int print_type(
-  char *str, size_t size, const void *ptr, void *user_data)
+int print_type(char *str, size_t size, const void *ptr, void *user_data)
 {
   if (idl_is_base_type(ptr))
     return print_base_type(str, size, ptr, user_data);
@@ -208,8 +207,7 @@ int print_type(
   return print_decl_type(str, size, ptr, "_");
 }
 
-int print_scoped_name(
-  char *str, size_t size, const void *ptr, void *user_data)
+int print_scoped_name(char *str, size_t size, const void *ptr, void *user_data)
 {
   if (idl_is_base_type(ptr))
     return print_base_type(str, size, ptr, user_data);