From 15905c746d30a46d11cfb746a98c47b8b5c1fa90 Mon Sep 17 00:00:00 2001
From: Melissa Elkadi <melissa@episci.com>
Date: Mon, 1 Mar 2021 15:13:50 -0800
Subject: [PATCH] Fixing cppcheck issues
---
common/utils/LOG/log.c | 2 +-
common/utils/T/T.h | 2 +-
common/utils/ocp_itti/intertask_interface.cpp | 1 +
nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c | 1 +
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c | 3 +++
openair1/PHY/TOOLS/nr_phy_scope.c | 2 +-
openair1/SCHED_UE/phy_procedures_lte_ue.c | 1 +
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c | 2 +-
8 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/common/utils/LOG/log.c b/common/utils/LOG/log.c
index 5340a80227e..81d22283db2 100644
--- a/common/utils/LOG/log.c
+++ b/common/utils/LOG/log.c
@@ -246,7 +246,7 @@ int write_file_matlab(const char *fname,
fprintf(fp,"%d \n",((unsigned char *)&data)[0]);
break;
default:
- AssertFatal(false, "unknown dump format: %d\n", format);
+ AssertFatal(false, "unknown dump format: %u\n", format);
}
if (format != 10 && format !=11 && format !=12 && format != 13 && format != 15) {
diff --git a/common/utils/T/T.h b/common/utils/T/T.h
index 626dbafd258..480a4e5a1d0 100644
--- a/common/utils/T/T.h
+++ b/common/utils/T/T.h
@@ -1,7 +1,7 @@
#ifndef _T_T_T_
#define _T_T_T_
-#if T_TRACER
+#if T_TRACER && !defined(__cppcheck__)
#include <stdint.h>
diff --git a/common/utils/ocp_itti/intertask_interface.cpp b/common/utils/ocp_itti/intertask_interface.cpp
index 318e4e9369d..aa01b590643 100644
--- a/common/utils/ocp_itti/intertask_interface.cpp
+++ b/common/utils/ocp_itti/intertask_interface.cpp
@@ -339,6 +339,7 @@ extern "C" {
int itti_create_queue(const task_info_t *taskInfo) {
pthread_mutex_lock (&lock_nb_queues);
int newQueue=nb_queues++;
+ // cppcheck-suppress memleakOnRealloc
AssertFatal(tasks=(task_list_t **) realloc(tasks, nb_queues * sizeof(*tasks)),"");
tasks[newQueue]= new task_list_t;
pthread_mutex_unlock (&lock_nb_queues);
diff --git a/nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c b/nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c
index efcb60ce963..7635f39ed05 100644
--- a/nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c
+++ b/nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c
@@ -44,6 +44,7 @@ nfapi_pnf_p7_config_t* nfapi_pnf_p7_config_create()
_this->_public.codec_config.allocate = &malloc;
_this->_public.codec_config.deallocate = &free;
+ // cppcheck-suppress memleak
return &(_this->_public);
}
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c b/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
index 347fbb026be..624f4b5217e 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
@@ -2923,6 +2923,9 @@ int allocate_REs_in_RB_MCH_khz_1dot25(int32_t **txdataF,
uint8_t skip_dc,
LTE_DL_FRAME_PARMS *frame_parms)
{
+ if (!qam_table_s)
+ abort();
+
uint32_t tti_offset;
uint8_t re,offset;
uint8_t qam64_table_offset_re = 0;
diff --git a/openair1/PHY/TOOLS/nr_phy_scope.c b/openair1/PHY/TOOLS/nr_phy_scope.c
index cb615238526..bf2b000e7e0 100644
--- a/openair1/PHY/TOOLS/nr_phy_scope.c
+++ b/openair1/PHY/TOOLS/nr_phy_scope.c
@@ -242,7 +242,7 @@ static void genericWaterFall (OAIgraph_t *graph, scopeSample_t *values, const in
for (int pix=0; pix<graph->w; pix++) {
scopeSample_t *end=values+(pix+1)*samplesPerPixel;
end-=2;
- AssertFatal(end <= values+datasize,"diff : %ld", end-values+datasize);
+ AssertFatal(end <= values+datasize,"diff : %tu", end-values+datasize);
double val=0;
for (scopeSample_t *s=values+(pix)*samplesPerPixel;
diff --git a/openair1/SCHED_UE/phy_procedures_lte_ue.c b/openair1/SCHED_UE/phy_procedures_lte_ue.c
index 5f8269c513d..47d53757172 100644
--- a/openair1/SCHED_UE/phy_procedures_lte_ue.c
+++ b/openair1/SCHED_UE/phy_procedures_lte_ue.c
@@ -3686,6 +3686,7 @@ void *UE_thread_slot1_dl_processing(void *arg) {
if ( (proc->sub_frame_start+1)%RX_NB_TH == 1 && threads.slot1_proc_two != -1 )
CPU_SET(threads.slot1_proc_two, &cpuset);
+ // cppcheck-suppress moduloAlwaysTrueFalse
if ( (proc->sub_frame_start+1)%RX_NB_TH == 2 && threads.slot1_proc_three != -1 )
CPU_SET(threads.slot1_proc_three, &cpuset);
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
index 2dfb4a7bf13..8aeaa255761 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
@@ -414,7 +414,7 @@ int trx_eth_read_udp(openair0_device *device, openair0_timestamp *timestamp, voi
char *temp_rx0 = ((char *)&temp_rx[1])-APP_HEADER_SIZE_BYTES;
#endif
#elif defined(__arm__) || defined(__aarch64__)
- int nsamps2 = (payload_size>>4)+1
+ int nsamps2 = (payload_size>>4)+1;
int16x8_t temp_rx[nsamps2];
char *temp_rx0 = ((char *)&temp_rx[1])-APP_HEADER_SIZE_BYTES;
#else
--
GitLab