From b30c9c8f3cb6b64c45a4860ca625e1b830d080f2 Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Tue, 26 Mar 2024 12:28:59 +0100
Subject: [PATCH] uselessAssignmentPtrArg

---
 common/config/config_load_configmodule.c                 | 7 +++----
 openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c | 2 --
 openair1/SCHED_NR_UE/fapi_nr_ue_l1.c                     | 1 -
 openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c             | 3 ---
 openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c              | 4 +++-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/common/config/config_load_configmodule.c b/common/config/config_load_configmodule.c
index ed4378f3ea..76808cf59f 100644
--- a/common/config/config_load_configmodule.c
+++ b/common/config/config_load_configmodule.c
@@ -424,13 +424,12 @@ void end_configmodule(configmodule_interface_t *cfgptr)
     
     cfgptr->numptrs=0;
     pthread_mutex_unlock(&cfgptr->memBlocks_mutex);
-    if ( cfgptr->cfgmode )
+    if (cfgptr->cfgmode)
       free(cfgptr->cfgmode);
 
-    if (  cfgptr->argv_info )
-      free( cfgptr->argv_info );
+    if (cfgptr->argv_info)
+      free(cfgptr->argv_info);
 
     free(cfgptr);
-    cfgptr=NULL;
   }
 }
diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
index 1ad61e51ad..f7806aa504 100644
--- a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
+++ b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
@@ -1336,7 +1336,6 @@ void NFAPI_NR_DMRS_TYPE1_average_prb(NR_DL_FRAME_PARMS *frame_parms,
   for (int i = 0; i < 2 * P_average; i++) {
     dl_ch[i] = ch;
   }
-  dl_ch += 2 * P_average;
 #else
   dl_ch[3].r += (ch.r * 1365) >> 15; // 1/12*16384
   dl_ch[3].i += (ch.i * 1365) >> 15; // 1/12*16384
@@ -1488,7 +1487,6 @@ void NFAPI_NR_DMRS_TYPE2_average_prb(NR_DL_FRAME_PARMS *frame_parms,
   for (int i = 0; i < 3 * P_average; i++) {
     dl_ch[i] = ch;
   }
-  dl_ch += 3 * P_average;
 #else
   dl_ch[3].r += (ch.r * 1365) >> 15; // 1/12*16384
   dl_ch[3].i += (ch.i * 1365) >> 15; // 1/12*16384
diff --git a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
index fe36aa3425..369c388ad3 100644
--- a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+++ b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
@@ -97,7 +97,6 @@ static void free_uci_inds(nfapi_nr_uci_indication_t *uci_ind)
     free(uci_ind->uci_list);
     uci_ind->uci_list = NULL;
     free(uci_ind);
-    uci_ind = NULL;
 }
 
 int8_t nr_ue_scheduled_response_stub(nr_scheduled_response_t *scheduled_response) {
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
index 3f59d64bd1..be7f9dfc1f 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
@@ -3731,13 +3731,10 @@ int nr_write_ce_ulsch_pdu(uint8_t *mac_ce,
     LOG_D(NR_MAC, "[UE] Generating ULSCH PDU : long_bsr size %d Lcgbit 0x%02x Buffer_size %d %d %d %d %d %d %d %d\n", mac_ce_size, *((uint8_t*) mac_ce),
           ((NR_BSR_LONG *) mac_ce)->Buffer_size0, ((NR_BSR_LONG *) mac_ce)->Buffer_size1, ((NR_BSR_LONG *) mac_ce)->Buffer_size2, ((NR_BSR_LONG *) mac_ce)->Buffer_size3,
           ((NR_BSR_LONG *) mac_ce)->Buffer_size4, ((NR_BSR_LONG *) mac_ce)->Buffer_size5, ((NR_BSR_LONG *) mac_ce)->Buffer_size6, ((NR_BSR_LONG *) mac_ce)->Buffer_size7);
-    // update pointer and length
-    mac_ce = Buffer_size_ptr;
     mac_ce_len += mac_ce_size + sizeof(NR_MAC_SUBHEADER_SHORT);
   }
 
   return mac_ce_len;
-
 }
 
 
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
index 1e92d08344..29feb0c4f4 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
@@ -3084,7 +3084,9 @@ uint8_t nr_ue_get_sdu(NR_UE_MAC_INST_t *mac,
   if (mac_ce_p->tot_mac_ce_len > 0) {
 
     LOG_D(NR_MAC, "In %s copying %d bytes of MAC CEs to the UL PDU \n", __FUNCTION__, mac_ce_p->tot_mac_ce_len);
-    nr_write_ce_ulsch_pdu(pdu, mac, 0, NULL, mac_ce_p->bsr_t, mac_ce_p->bsr_s, mac_ce_p->bsr_l);
+    int size = nr_write_ce_ulsch_pdu(pdu, mac, 0, NULL, mac_ce_p->bsr_t, mac_ce_p->bsr_s, mac_ce_p->bsr_l);
+    if (size != mac_ce_p->tot_mac_ce_len)
+      LOG_E(NR_MAC, "MAC CE size computed by nr_write_ce_ulsch_pdu is %d while the one assumed before is %d\n", size, mac_ce_p->tot_mac_ce_len);
     pdu += (unsigned char) mac_ce_p->tot_mac_ce_len;
 
 #ifdef ENABLE_MAC_PAYLOAD_DEBUG