Merge pull request #175 from nasa/142-reserved-identifier-violation

Review and normalized all file header include guards
nasa · Jun 22, 2023 · 433beeb · 433beeb
2 parents 454eff7 + b5aa96f
commit 433beeb
Show file tree

Hide file tree

Showing 28 changed files with 50 additions and 49 deletions.
diff --git a/include/crypto.h b/include/crypto.h
@@ -16,8 +16,8 @@
    [email protected]
 */
 
-#ifndef _crypto_h_
-#define _crypto_h_
+#ifndef CRYPTO_H
+#define CRYPTO_H
 
 /*
 ** Crypto Includes
@@ -217,4 +217,4 @@ extern uint8_t badFECF;
 extern uint32_t crc32Table[256];
 extern uint16_t crc16Table[256];
 
-#endif // _crypto_h_z
+#endif //CRYPTO_H
diff --git a/include/crypto_config.h b/include/crypto_config.h
@@ -15,8 +15,8 @@
    NASA IV&V
    [email protected]
 */
-#ifndef _crypto_config_h_
-#define _crypto_config_h_
+#ifndef CRYPTO_CONFIG_H
+#define CRYPTO_CONFIG_H
 
 // Build Defines
 //#define BUILD_STATIC
@@ -186,4 +186,5 @@
 // Logic Behavior Defines
 #define CRYPTO_FALSE 0
 #define CRYPTO_TRUE 1
-#endif
+
+#endif //CRYPTO_CONFIG_H
diff --git a/include/crypto_config_structs.h b/include/crypto_config_structs.h
@@ -15,8 +15,8 @@ ITC Team
 NASA IV&V
 [email protected]
 */
-#ifndef _crypto_config_structs_h_
-#define _crypto_config_structs_h_
+#ifndef CRYPTO_CONFIG_STRUCTS_H
+#define CRYPTO_CONFIG_STRUCTS_H
 
 #include "crypto_config.h"
 
@@ -246,5 +246,4 @@ typedef struct
 } CamConfig_t;
 #define CAM_CONFIG_SIZE (sizeof(CamConfig_t))
 
-
-#endif
+#endif //CRYPTO_CONFIG_STRUCTS_H
diff --git a/include/crypto_error.h b/include/crypto_error.h
@@ -15,8 +15,8 @@
    NASA IV&V
    [email protected]
 */
-#ifndef _crypto_error_h_
-#define _crypto_error_h_
+#ifndef CRYPTO_ERROR_H
+#define CRYPTO_ERROR_H
 
 /*
  * If error codes are added to this header file, their enum string must be added to the error lists (in crypto_error.c)
@@ -129,4 +129,4 @@ extern char *crypto_enum_errlist_crypto_cam[];
 #define CRYPTO_UNDEFINED_ERROR "CRYPTO_UNDEFINED_ERROR_CODE"
 
 
-#endif //_crypto_error_h_
+#endif //CRYPTO_ERROR_H
diff --git a/include/crypto_events.h b/include/crypto_events.h
@@ -15,8 +15,8 @@
    NASA IV&V
    [email protected]
 */
-#ifndef _crypto_events_h_
-#define _crypto_events_h_
+#ifndef CRYPTO_EVENTS_H
+#define CRYPTO_EVENTS_H
 
 #define FECF_ERR_EID 0
 #define MKID_INVALID_EID 1
@@ -29,4 +29,4 @@
 
 #define STARTUP 10
 
-#endif
+#endif //CRYPTO_EVENTS_H
diff --git a/include/crypto_print.h b/include/crypto_print.h
@@ -16,8 +16,8 @@
    [email protected]
 */
 
-#ifndef _crypto_print_h_
-#define _crypto_print_h_
+#ifndef CRYPTO_PRINT_H
+#define CRYPTO_PRINT_H
 
 /*
 ** Includes
@@ -37,4 +37,5 @@ void Crypto_saPrint(SecurityAssociation_t* sa);
 void Crypto_hexprint(const void* c, size_t n);
 void Crypto_binprint(void* c, size_t n);
 void Crypto_mpPrint(GvcidManagedParameters_t* managed_parameters, uint8_t print_children);
-#endif
+
+#endif //CRYPTO_PRINT_H
diff --git a/include/crypto_structs.h b/include/crypto_structs.h
@@ -16,8 +16,8 @@
    [email protected]
 */
 
-#ifndef _crypto_structs_h_
-#define _crypto_structs_h_
+#ifndef CRYPTO_STRUCTS_H
+#define CRYPTO_STRUCTS_H
 
 #include "crypto_config.h"
 
@@ -403,4 +403,4 @@ typedef struct
 #define TM_MIN_SIZE                                                                                                    \
     (TM_FRAME_PRIMARYHEADER_SIZE + TM_FRAME_SECHEADER_SIZE + TM_FRAME_SECTRAILER_SIZE + TM_FRAME_CLCW_SIZE)
 
-#endif
+#endif //CRYPTO_STRUCTS_H
diff --git a/include/cryptography_interface.h b/include/cryptography_interface.h
@@ -87,4 +87,4 @@ typedef struct
 CryptographyInterface get_cryptography_interface_libgcrypt(void);
 CryptographyInterface get_cryptography_interface_kmc_crypto_service(void);
 
-#endif // CRYPTOLIB_CRYPTOGRAPHY_INTERFACE_H
+#endif //CRYPTOLIB_CRYPTOGRAPHY_INTERFACE_H
diff --git a/include/key_interface.h b/include/key_interface.h
@@ -15,8 +15,8 @@
    NASA IV&V
    [email protected]
 */
-#ifndef _key_interface_h_
-#define _key_interface_h_
+#ifndef KEY_INTERFACE_H
+#define KEY_INTERFACE_H
 
 #include "crypto_error.h"
 #include "crypto_structs.h"
@@ -46,4 +46,4 @@ KeyInterface get_key_interface_custom(void);
 KeyInterface get_key_interface_internal(void);
 KeyInterface get_key_interface_kmc(void);
 
-#endif /* _key_interface_h_ */
+#endif // KEY_INTERFACE_H
diff --git a/include/sadb_routine.h b/include/sadb_routine.h
@@ -53,4 +53,4 @@ SadbRoutine get_sadb_routine_mariadb(void);
 SadbRoutine get_sadb_routine_inmemory(void);
 // SadbRoutine init_parse_sadb_routine(uint8_t* );
 
-#endif // CRYPTOLIB_SADB_ROUTINE_H
+#endif //CRYPTOLIB_SADB_ROUTINE_H
diff --git a/src/crypto/kmc/base64.h b/src/crypto/kmc/base64.h
@@ -28,8 +28,8 @@
  * @version 2.1.2
  **/
 
-#ifndef _BASE64_H
-#define _BASE64_H
+#ifndef BASE64_H
+#define BASE64_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -60,4 +60,4 @@ int32_t base64Decode(const char_t* input, size_t inputLen, void* output,
 }
 #endif
 
-#endif
+#endif //BASE64_H
diff --git a/src/crypto/kmc/base64url.h b/src/crypto/kmc/base64url.h
@@ -30,8 +30,8 @@
 
 // https://www.oryx-embedded.com/doc/base64_8h_source.html
 
-#ifndef _BASE64URL_H
-#define _BASE64URL_H
+#ifndef BASE64URL_H
+#define BASE64URL_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -69,4 +69,4 @@ int32_t base64urlDecode(const char_t* input, size_t inputLen, void* output,
 }
 #endif
 
-#endif
+#endif //BASE64URL_H
diff --git a/support/standalone/standalone.h b/support/standalone/standalone.h
@@ -106,4 +106,4 @@ void crypto_standalone_cleanup(const int signal);
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif /* CRYPTOLIB_STANDALONE_H */
+#endif //CRYPTOLIB_STANDALONE_H
diff --git a/test/include/apply_security.h b/test/include/apply_security.h
@@ -32,4 +32,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_APPLY_SECURITY_H
+#endif //CRYPTOLIB_APPLY_SECURITY_H
diff --git a/test/include/crypto_sequence.h b/test/include/crypto_sequence.h
@@ -32,4 +32,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_CRYPTO_SEQUENCE_H
+#endif //CRYPTOLIB_CRYPTO_SEQUENCE_H
diff --git a/test/include/et_dt_validation.h b/test/include/et_dt_validation.h
@@ -32,4 +32,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_ET_DT_VALIDATION_H
+#endif //CRYPTOLIB_ET_DT_VALIDATION_H
diff --git a/test/include/process_security.h b/test/include/process_security.h
@@ -32,4 +32,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_PROCESS_SECURITY_H
+#endif //CRYPTOLIB_PROCESS_SECURITY_H
diff --git a/test/include/shared_util.h b/test/include/shared_util.h
@@ -45,4 +45,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_SHARED_UTIL_H
+#endif //CRYPTOLIB_SHARED_UTIL_H
diff --git a/test/include/ut_crypto.h b/test/include/ut_crypto.h
@@ -33,4 +33,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_UT_CRYPTO_H
+#endif //CRYPTOLIB_UT_CRYPTO_H
diff --git a/test/include/ut_crypto_aos.h b/test/include/ut_crypto_aos.h
@@ -32,4 +32,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_UT_CRYPTO_AOS_H
+#endif //CRYPTOLIB_UT_CRYPTO_AOS_H
diff --git a/test/include/ut_crypto_config.h b/test/include/ut_crypto_config.h
@@ -32,4 +32,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_UT_CRYPTO_CONFIG_H
+#endif //CRYPTOLIB_UT_CRYPTO_CONFIG_H
diff --git a/test/include/ut_crypto_mc.h b/test/include/ut_crypto_mc.h
@@ -32,4 +32,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_UT_CRYPTO_MC_H
+#endif //CRYPTOLIB_UT_CRYPTO_MC_H
diff --git a/test/include/ut_mariadb.h b/test/include/ut_mariadb.h
@@ -32,4 +32,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_UT_MARIA_DB_H
+#endif //CRYPTOLIB_UT_MARIA_DB_H
diff --git a/test/include/ut_tc_apply.h b/test/include/ut_tc_apply.h
@@ -32,4 +32,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_UT_TC_APPLY_H
+#endif //CRYPTOLIB_UT_TC_APPLY_H
diff --git a/test/include/ut_tc_process.h b/test/include/ut_tc_process.h
@@ -33,4 +33,4 @@ extern "C"
 #endif
 
 
-#endif // CRYPTOLIB_UT_TC_PROCESS_H
+#endif //CRYPTOLIB_UT_TC_PROCESS_H
diff --git a/test/include/ut_tm_apply.h b/test/include/ut_tm_apply.h
@@ -32,4 +32,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_UT_TM_APPLY_H
+#endif //CRYPTOLIB_UT_TM_APPLY_H
diff --git a/test/include/ut_tm_process.h b/test/include/ut_tm_process.h
@@ -32,4 +32,4 @@ extern "C"
 } /* Close scope of 'extern "C"' declaration which encloses file. */
 #endif
 
-#endif // CRYPTOLIB_UT_TM_PROCESS_H
+#endif //CRYPTOLIB_UT_TM_PROCESS_H
diff --git a/test/include/utest.h b/test/include/utest.h
@@ -1153,4 +1153,4 @@ int utest_main(int argc, const char* const argv[]) {
     return utest_main(argc, argv);                                             \
   }
 
-#endif /* SHEREDOM_UTEST_H_INCLUDED */
+#endif //SHEREDOM_UTEST_H_INCLUDED