Clean up function prototypes

include/cmp_entity.h

@@ -192,7 +192,7 @@ int cmp_ent_set_coarse_end_time(struct cmp_entity *ent, uint32_t coarse_time);
 int cmp_ent_set_fine_end_time(struct cmp_entity *ent, uint16_t fine_time);
 
 int cmp_ent_set_data_type(struct cmp_entity *ent, enum cmp_data_type data_type,
-			  int raw_mode);
+			  int raw_mode_flag);
 int cmp_ent_set_cmp_mode(struct cmp_entity *ent, enum cmp_mode cmp_mode_used);
 int cmp_ent_set_model_value(struct cmp_entity *ent, uint32_t model_value_used);
 int cmp_ent_set_model_id(struct cmp_entity *ent, uint32_t model_id);
@@ -221,23 +221,23 @@ int cmp_ent_set_ima_ap2_golomb_par(struct cmp_entity *ent, uint32_t ap2_golomb_p
 
 
 /* set functions for specific entity header for non-imagette data product types */
-int cmp_ent_set_non_ima_spill1(struct cmp_entity *ent, uint32_t spill1_used);
-int cmp_ent_set_non_ima_cmp_par1(struct cmp_entity *ent, uint32_t cmp_par1_used);
+int cmp_ent_set_non_ima_spill1(struct cmp_entity *ent, uint32_t spill_1_used);
+int cmp_ent_set_non_ima_cmp_par1(struct cmp_entity *ent, uint32_t cmp_par_1_used);
 
-int cmp_ent_set_non_ima_spill2(struct cmp_entity *ent, uint32_t spill2_used);
-int cmp_ent_set_non_ima_cmp_par2(struct cmp_entity *ent, uint32_t cmp_par2_used);
+int cmp_ent_set_non_ima_spill2(struct cmp_entity *ent, uint32_t spill_2_used);
+int cmp_ent_set_non_ima_cmp_par2(struct cmp_entity *ent, uint32_t cmp_par_2_used);
 
-int cmp_ent_set_non_ima_spill3(struct cmp_entity *ent, uint32_t spill3_used);
-int cmp_ent_set_non_ima_cmp_par3(struct cmp_entity *ent, uint32_t cmp_par3_used);
+int cmp_ent_set_non_ima_spill3(struct cmp_entity *ent, uint32_t spill_3_used);
+int cmp_ent_set_non_ima_cmp_par3(struct cmp_entity *ent, uint32_t cmp_par_3_used);
 
-int cmp_ent_set_non_ima_spill4(struct cmp_entity *ent, uint32_t spill4_used);
-int cmp_ent_set_non_ima_cmp_par4(struct cmp_entity *ent, uint32_t cmp_par4_used);
+int cmp_ent_set_non_ima_spill4(struct cmp_entity *ent, uint32_t spill_4_used);
+int cmp_ent_set_non_ima_cmp_par4(struct cmp_entity *ent, uint32_t cmp_par_4_used);
 
-int cmp_ent_set_non_ima_spill5(struct cmp_entity *ent, uint32_t spill5_used);
-int cmp_ent_set_non_ima_cmp_par5(struct cmp_entity *ent, uint32_t cmp_par5_used);
+int cmp_ent_set_non_ima_spill5(struct cmp_entity *ent, uint32_t spill_5_used);
+int cmp_ent_set_non_ima_cmp_par5(struct cmp_entity *ent, uint32_t cmp_par_5_used);
 
-int cmp_ent_set_non_ima_spill6(struct cmp_entity *ent, uint32_t spill6_used);
-int cmp_ent_set_non_ima_cmp_par6(struct cmp_entity *ent, uint32_t cmp_par6_used);
+int cmp_ent_set_non_ima_spill6(struct cmp_entity *ent, uint32_t spill_6_used);
+int cmp_ent_set_non_ima_cmp_par6(struct cmp_entity *ent, uint32_t cmp_par_6_used);
 
 
 
@@ -311,7 +311,7 @@ int32_t cmp_ent_get_cmp_data(struct cmp_entity *ent, uint32_t *data_buf,
 			     uint32_t data_buf_size);
 
 /* calculate the size of the compression entity header */
-uint32_t cmp_ent_cal_hdr_size(enum cmp_data_type data_type, int raw_mode);
+uint32_t cmp_ent_cal_hdr_size(enum cmp_data_type data_type, int raw_mode_flag);
 
 
 #if defined __has_include

include/cmp_support.h

@@ -317,8 +317,6 @@ int rdcu_supported_cmp_mode_is_used(enum cmp_mode cmp_mode);
 int zero_escape_mech_is_used(enum cmp_mode cmp_mode);
 int multi_escape_mech_is_used(enum cmp_mode cmp_mode);
 
-/* unsigned int round_fwd(unsigned int value, unsigned int round); */
-/* unsigned int round_inv(unsigned int value, unsigned int round); */
 unsigned int cmp_up_model(unsigned int data, unsigned int model,
 			  unsigned int model_value, unsigned int round);