#69 - Find and replace issue fixed with * *;

nasa · Feb 3, 2022 · 332916c · 332916c
1 parent 7af1696
commit 332916c
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 103 deletions.
diff --git a/include/crypto.h b/include/crypto.h
@@ -81,7 +81,7 @@ extern int32_t Crypto_Shutdown(void); // Free all allocated memory
 
 // Telecommand (TC)
 extern int32_t Crypto_TC_ApplySecurity(const uint8_t* p_in_frame, const uint16_t in_frame_length,
-                                       uint8_t* *pp_enc_frame, uint16_t* p_enc_frame_len);
+                                       uint8_t** pp_enc_frame, uint16_t* p_enc_frame_len);
 extern int32_t Crypto_TC_ProcessSecurity(uint8_t* ingest, int *len_ingest, TC_t* tc_sdls_processed_frame);
 // Telemetry (TM)
 extern int32_t Crypto_TM_ApplySecurity(uint8_t* ingest, int *len_ingest);
@@ -143,7 +143,7 @@ int32_t Crypto_PDU(uint8_t* ingest, TC_t* tc_frame);
 // Managed Parameter Functions
 int32_t Crypto_Get_Managed_Parameters_For_Gvcid(uint8_t tfvn, uint16_t scid, uint8_t vcid,
                                                        GvcidManagedParameters_t* managed_parameters_in,
-                                                       GvcidManagedParameters_t* *managed_parameters_out);
+                                                       GvcidManagedParameters_t** managed_parameters_out);
 int32_t crypto_config_add_gvcid_managed_parameter_recursion(uint8_t tfvn, uint16_t scid, uint8_t vcid,
                                                                    uint8_t has_fecf, uint8_t has_segmentation_hdr,
                                                                    GvcidManagedParameters_t* managed_parameter);

diff --git a/include/sadb_routine.h b/include/sadb_routine.h
@@ -33,8 +33,8 @@ typedef struct
     int32_t (*sadb_init)(void);
     int32_t (*sadb_close)(void);
     // Security Association Interaction Functions
-    int32_t (*sadb_get_sa_from_spi)(uint16_t, SecurityAssociation_t* *);
-    int32_t (*sadb_get_operational_sa_from_gvcid)(uint8_t, uint16_t, uint16_t, uint8_t, SecurityAssociation_t* *);
+    int32_t (*sadb_get_sa_from_spi)(uint16_t, SecurityAssociation_t** );
+    int32_t (*sadb_get_operational_sa_from_gvcid)(uint8_t, uint16_t, uint16_t, uint8_t, SecurityAssociation_t**);
     int32_t (*sadb_save_sa)(SecurityAssociation_t* );
     // Security Association Utility Functions
     int32_t (*sadb_sa_stop)(void);

diff --git a/src/src_main/crypto.c b/src/src_main/crypto.c
@@ -614,7 +614,7 @@ int32_t Crypto_PDU(uint8_t* ingest, TC_t* tc_frame)
  **/
 int32_t Crypto_Get_Managed_Parameters_For_Gvcid(uint8_t tfvn, uint16_t scid, uint8_t vcid,
                                                 GvcidManagedParameters_t* managed_parameters_in,
-                                                GvcidManagedParameters_t* *managed_parameters_out)
+                                                GvcidManagedParameters_t** managed_parameters_out)
 {
     int32_t status = MANAGED_PARAMETERS_FOR_GVCID_NOT_FOUND;
 
@@ -664,7 +664,7 @@ void Crypto_Free_Managed_Parameters(GvcidManagedParameters_t* managed_parameters
  * @param tc_sdls_processed_frame: TC_t*
  * @param ingest: uint8_t*
  * @note TODO - Actually update based on variable config
- * */
+ **/
 int32_t Crypto_Process_Extended_Procedure_Pdu(TC_t* tc_sdls_processed_frame, uint8_t* ingest)
 {
     int32_t status = CRYPTO_LIB_SUCCESS;

diff --git a/src/src_main/crypto_tc.c b/src/src_main/crypto_tc.c
@@ -32,7 +32,7 @@
  * @param p_enc_frame_len: uint16
  * @return int32: Success/Failure
  **/
-int32_t Crypto_TC_ApplySecurity(const uint8_t* p_in_frame, const uint16_t in_frame_length, uint8_t* *pp_in_frame,
+int32_t Crypto_TC_ApplySecurity(const uint8_t* p_in_frame, const uint16_t in_frame_length, uint8_t** pp_in_frame,
                                 uint16_t* p_enc_frame_len)
 {
     // Local Variables

diff --git a/src/src_main/sadb_routine_inmemory.template.c b/src/src_main/sadb_routine_inmemory.template.c
@@ -19,8 +19,8 @@ static int32_t sadb_config(void);
 static int32_t sadb_init(void);
 static int32_t sadb_close(void);
 // Security Association Interaction Functions
-static int32_t sadb_get_sa_from_spi(uint16_t, SecurityAssociation_t* *);
-static int32_t sadb_get_operational_sa_from_gvcid(uint8_t, uint16_t, uint16_t, uint8_t, SecurityAssociation_t* *);
+static int32_t sadb_get_sa_from_spi(uint16_t, SecurityAssociation_t**);
+static int32_t sadb_get_operational_sa_from_gvcid(uint8_t, uint16_t, uint16_t, uint8_t, SecurityAssociation_t**);
 static int32_t sadb_save_sa(SecurityAssociation_t* sa);
 // Security Association Utility Functions
 static int32_t sadb_sa_stop(void);
@@ -279,7 +279,7 @@ static int32_t sadb_close(void)
  * @param security_association: SecurityAssociation_t**
  * @return int32: Success/Failure
  **/
-static int32_t sadb_get_sa_from_spi(uint16_t spi, SecurityAssociation_t* *security_association)
+static int32_t sadb_get_sa_from_spi(uint16_t spi, SecurityAssociation_t** security_association)
 {
     int32_t status = CRYPTO_LIB_SUCCESS;
     if (sa == NULL)
@@ -312,7 +312,7 @@ static int32_t sadb_get_sa_from_spi(uint16_t spi, SecurityAssociation_t* *securi
  * @return int32: Success/Failure
  **/
 static int32_t sadb_get_operational_sa_from_gvcid(uint8_t tfvn, uint16_t scid, uint16_t vcid, uint8_t mapid,
-                                           SecurityAssociation_t* *security_association)
+                                           SecurityAssociation_t** security_association)
 {
     int32_t status = CRYPTO_LIB_ERR_NO_OPERATIONAL_SA;
     int i;

diff --git a/src/src_mysql/sadb_routine_mariadb.template.c b/src/src_mysql/sadb_routine_mariadb.template.c
@@ -28,8 +28,8 @@ static int32_t sadb_config(void);
 static int32_t sadb_init(void);
 static int32_t sadb_close(void);
 // Security Association Interaction Functions
-static int32_t sadb_get_sa_from_spi(uint16_t, SecurityAssociation_t* *);
-static int32_t sadb_get_operational_sa_from_gvcid(uint8_t, uint16_t, uint16_t, uint8_t, SecurityAssociation_t* *);
+static int32_t sadb_get_sa_from_spi(uint16_t, SecurityAssociation_t**);
+static int32_t sadb_get_operational_sa_from_gvcid(uint8_t, uint16_t, uint16_t, uint8_t, SecurityAssociation_t**);
 static int32_t sadb_save_sa(SecurityAssociation_t* sa);
 // Security Association Utility Functions
 static int32_t sadb_sa_stop(void);
@@ -60,7 +60,7 @@ static const char* SQL_SADB_UPDATE_IV_ARC_BY_SPI =
         " WHERE spi='%d' AND tfvn='%d' AND scid='%d' AND vcid='%d' AND mapid='%d'";
 
 // sadb_routine mariaDB private helper functions
-static int32_t parse_sa_from_mysql_query(char* query, SecurityAssociation_t* *security_association);
+static int32_t parse_sa_from_mysql_query(char* query, SecurityAssociation_t** security_association);
 static int32_t convert_hexstring_to_byte_array(char* hexstr, uint8_t* byte_array);
 static char* convert_byte_array_to_hexstring(void* src_buffer, size_t buffer_length);
 
@@ -172,7 +172,7 @@ static int32_t sadb_close(void)
 }
 
 // Security Association Interaction Functions
-static int32_t sadb_get_sa_from_spi(uint16_t spi, SecurityAssociation_t* *security_association)
+static int32_t sadb_get_sa_from_spi(uint16_t spi, SecurityAssociation_t** security_association)
 {
     int32_t status = CRYPTO_LIB_SUCCESS;
 
@@ -184,7 +184,7 @@ static int32_t sadb_get_sa_from_spi(uint16_t spi, SecurityAssociation_t* *securi
     return status;
 }
 static int32_t sadb_get_operational_sa_from_gvcid(uint8_t tfvn, uint16_t scid, uint16_t vcid, uint8_t mapid,
-                                                  SecurityAssociation_t* *security_association)
+                                                  SecurityAssociation_t** security_association)
 {
     int32_t status = CRYPTO_LIB_SUCCESS;
 
@@ -272,7 +272,7 @@ static int32_t sadb_sa_delete(void)
 }
 
 // sadb_routine private helper functions
-static int32_t parse_sa_from_mysql_query(char* query, SecurityAssociation_t* *security_association)
+static int32_t parse_sa_from_mysql_query(char* query, SecurityAssociation_t** security_association)
 {
     int32_t status = CRYPTO_LIB_SUCCESS;
     SecurityAssociation_t* sa = malloc(sizeof(SecurityAssociation_t));

diff --git a/util/include/shared_util.h b/util/include/shared_util.h
@@ -38,7 +38,7 @@ extern "C"
     void debug_printf(const char* format, ...);
     void debug_hexprintf(const char* bin_data, int size_bin_data);
 
-    void hex_conversion(char* buffer_h, char* *buffer_b, int *buffer_b_length);
+    void hex_conversion(char* buffer_h, char** buffer_b, int *buffer_b_length);
     int convert_hexstring_to_byte_array(char* source_str, char* dest_buffer);
 
 #ifdef __cplusplus