diff --git a/lib/decompress/cmp_max_used_bits_list.h b/lib/decompress/cmp_max_used_bits_list.h
index 35506c2ffca24601aed6d4bd6de3769c89e34128..317c7163fab7894654fb3d06e9911c9d64d63da2 100644
--- a/lib/decompress/cmp_max_used_bits_list.h
+++ b/lib/decompress/cmp_max_used_bits_list.h
@@ -28,11 +28,11 @@
 #include "../common/cmp_data_types.h"
 
 
-struct cmp_max_used_bits *cmp_max_used_bits_list_get(uint8_t version);
+const struct cmp_max_used_bits *cmp_max_used_bits_list_get(uint8_t version);
 
 int cmp_max_used_bits_list_add(struct cmp_max_used_bits const *item);
 
-int cmp_max_used_bits_list_delet(uint8_t version);
+void cmp_max_used_bits_list_delet(uint8_t version);
 
 void cmp_max_used_bits_list_empty(void);
 
diff --git a/lib/rdcu_compress/cmp_rdcu.c b/lib/rdcu_compress/cmp_rdcu.c
index 6354ee5f3eebb1a3f5e506a8c01e263379777390..e804995d6d009cf163159bc2161843762da50413 100644
--- a/lib/rdcu_compress/cmp_rdcu.c
+++ b/lib/rdcu_compress/cmp_rdcu.c
@@ -513,7 +513,7 @@ int rdcu_inject_edac_error(const struct cmp_cfg *cfg, uint32_t addr)
 		return -1;
 
 	/* disable edac */
-	for (sub_chip_die_addr = 1; sub_chip_die_addr <= 4; sub_chip_die_addr ++) {
+	for (sub_chip_die_addr = 1; sub_chip_die_addr <= 4; sub_chip_die_addr++) {
 		rdcu_edac_set_sub_chip_die_addr(sub_chip_die_addr);
 		rdcu_edac_set_ctrl_reg_write_op();
 		rdcu_edac_set_bypass();
@@ -542,7 +542,7 @@ int rdcu_inject_edac_error(const struct cmp_cfg *cfg, uint32_t addr)
 		/* It looks like there is a bug when displaying the bypass status of the 2. and 4. SRAM chip. */
 		if (2 != sub_chip_die_addr && 4 != sub_chip_die_addr)
 #endif
-			if (0 == rdcu_edac_get_bypass_status()) {
+			if (rdcu_edac_get_bypass_status() == 0) {
 				printf("Error: bypass status unexpected !\n");
 				return -1;
 			}
@@ -570,7 +570,7 @@ int rdcu_inject_edac_error(const struct cmp_cfg *cfg, uint32_t addr)
 
 
 	/* enable edac again */
-	for (sub_chip_die_addr = 1; sub_chip_die_addr <= 4; sub_chip_die_addr ++) {
+	for (sub_chip_die_addr = 1; sub_chip_die_addr <= 4; sub_chip_die_addr++) {
 		if (rdcu_edac_set_sub_chip_die_addr(sub_chip_die_addr))
 			return -1;
 		rdcu_edac_set_ctrl_reg_write_op();
diff --git a/lib/rdcu_compress/rdcu_rmap.c b/lib/rdcu_compress/rdcu_rmap.c
index 39721470065a0b8a5214961517ac71a7e09242ed..5eee776b5f1ccac88fe5db00374ac89e7148a5c9 100644
--- a/lib/rdcu_compress/rdcu_rmap.c
+++ b/lib/rdcu_compress/rdcu_rmap.c
@@ -296,7 +296,7 @@ static int rdcu_process_rx(void)
 			{
 				uint32_t i, tmp;
 
-				for (i = 0; i < rp->data_len; i+=sizeof(tmp)) {
+				for (i = 0; i < rp->data_len; i += sizeof(tmp)) {
 					memcpy(&tmp, &rp->data[i], sizeof(tmp));
 					be32_to_cpus(&tmp);
 					memcpy(&rp->data[i], &tmp, sizeof(tmp));
diff --git a/programs/rdcu_pkt_to_file.c b/programs/rdcu_pkt_to_file.c
index 8858d46164c6b64a39376dfff769eb73deb53fc4..28df657cf3df16d4d7842f141b3b404838263437 100644
--- a/programs/rdcu_pkt_to_file.c
+++ b/programs/rdcu_pkt_to_file.c
@@ -71,7 +71,7 @@ void set_tc_folder_dir(const char *dir_name)
  * @see https://developers.redhat.com/blog/2018/05/24/detecting-string-truncation-with-gcc-8/
  */
 
-static FILE *open_file(const char *dir_name, int n_tc)
+static FILE *open_file_tc(const char *dir_name, int n_tc)
 {
 	char *pathname;
 	FILE *fp;
@@ -162,7 +162,7 @@ static int32_t rmap_tx_to_file(const void *hdr, uint32_t hdr_size,
 		return -1;
 	}
 
-	fp = open_file(tc_folder_dir, n_pkt);
+	fp = open_file_tc(tc_folder_dir, n_pkt);
 
 	if (fp == NULL) {
 		perror("fopen()");
diff --git a/test/cmp_max_used_bits/test_cmp_max_used_bits_list.c b/test/cmp_max_used_bits/test_cmp_max_used_bits_list.c
index 1ffd4e4f4866b06a7521503ae7320988bab2c005..2557d827a1505219c5d7c7d7f71bab7e5766af51 100644
--- a/test/cmp_max_used_bits/test_cmp_max_used_bits_list.c
+++ b/test/cmp_max_used_bits/test_cmp_max_used_bits_list.c
@@ -63,7 +63,7 @@ void* malloc(size_t size)
 void test_cmp_max_used_bits_list(void)
 {
 	struct cmp_max_used_bits i_32, i_34, i_35, i_36, i_255, i_0;
-	struct cmp_max_used_bits *p;
+	const struct cmp_max_used_bits *p;
 	int return_val;
 
 	/* set up max_used_bits item */
diff --git a/test/decmp/test_decmp.c b/test/decmp/test_decmp.c
index cc5f071896b892fe587986a202e8eedb903ab04b..d7fccaa2830bd22cd0f54d821b097baf259f318c 100644
--- a/test/decmp/test_decmp.c
+++ b/test/decmp/test_decmp.c
@@ -1043,7 +1043,7 @@ void test_decompress_imagette_model(void)
 	uint16_t data[5]  = {0};
 	uint16_t model[5] = {0, 1, 2, 3, 4};
 	uint16_t up_model[5]  = {0};
-	uint32_t cmp_data[] = {0};
+	uint32_t cmp_data[2] = {0};
 	struct cmp_cfg cfg = {0};
 	struct bit_decoder dec;
 	int err;