From 9fe1167f29a2f509d6173fc1d5b1f45e2a59347b Mon Sep 17 00:00:00 2001
From: Melissa Elkadi <melissa@episci.com>
Date: Tue, 2 Mar 2021 13:10:09 -0800
Subject: [PATCH] Remove cppcheck-suppressions that were prev added

These cppcheck errors are occuring in code
that is untouched by this merge request.
---
 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/SCHED_UE/phy_procedures_lte_ue.c     | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/common/utils/T/T.h b/common/utils/T/T.h
index 480a4e5a1d0..626dbafd258 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 && !defined(__cppcheck__)
+#if T_TRACER
 
 #include <stdint.h>
 
diff --git a/common/utils/ocp_itti/intertask_interface.cpp b/common/utils/ocp_itti/intertask_interface.cpp
index aa01b590643..318e4e9369d 100644
--- a/common/utils/ocp_itti/intertask_interface.cpp
+++ b/common/utils/ocp_itti/intertask_interface.cpp
@@ -339,7 +339,6 @@ 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 7635f39ed05..efcb60ce963 100644
--- a/nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c
+++ b/nfapi/open-nFAPI/pnf/src/pnf_p7_interface.c
@@ -44,7 +44,6 @@ 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/SCHED_UE/phy_procedures_lte_ue.c b/openair1/SCHED_UE/phy_procedures_lte_ue.c
index 47d53757172..5f8269c513d 100644
--- a/openair1/SCHED_UE/phy_procedures_lte_ue.c
+++ b/openair1/SCHED_UE/phy_procedures_lte_ue.c
@@ -3686,7 +3686,6 @@ 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);
 
-- 
GitLab