Continue addressing CPPCheck issues/warnings

src/amf-app/amf_app.cpp

@@ -86,7 +86,7 @@ amf_app::amf_app(const amf_config& amf_cfg) {
   timer_id_t tid = itti_inst->timer_setup(
       amf_cfg.statistics_interval, 0, TASK_AMF_APP,
       TASK_AMF_APP_PERIODIC_STATISTICS, 0);
-  Logger::amf_app().startup("Started timer(%d)", tid);
+  Logger::amf_app().startup("Started timer (%d)", tid);
 }
 
 //------------------------------------------------------------------------------

src/ngap/ngapIEs/UPTransportLayerInformation.cpp

@@ -76,10 +76,11 @@ bool UpTransportLayerInformation::encode2UpTransportLayerInformation(
     return false;
   }
 
-  if (!gtpTeid->encode2GtpTeid(gtptunnel->gTP_TEID)) return false;
+  if (!gtpTeid->encode2GtpTeid(gtptunnel->gTP_TEID)) {
+    free_wrapper((void**) &gtptunnel);
+    return false;
+  }
   upTransportLayerInfo.choice.gTPTunnel = gtptunnel;
-
-  //free_wrapper((void**) &gtptunnel);
   return true;
 }
 

src/ngap/ngapMsgs/DownlinkRANStatusTransfer.cpp

@@ -58,7 +58,7 @@ void DownlinkRANStatusTransfer::setAmfUeNgapId(unsigned long id) {
 
   ret = ASN_SEQUENCE_ADD(&DownlinkranstatustransferIEs->protocolIEs.list, ie);
   if (ret != 0) cout << "encode AMF_UE_NGAP_ID IE error" << endl;
-  //free_wrapper((void**) &ie);
+  // free_wrapper((void**) &ie);
 }
 void DownlinkRANStatusTransfer::setRanUeNgapId(uint32_t id) {
   if (!ranUeNgapId) ranUeNgapId = new RAN_UE_NGAP_ID();
@@ -81,7 +81,7 @@ void DownlinkRANStatusTransfer::setRanUeNgapId(uint32_t id) {
 
   ret = ASN_SEQUENCE_ADD(&DownlinkranstatustransferIEs->protocolIEs.list, ie);
   if (ret != 0) cout << "encode RAN_UE_NGAP_ID IE error" << endl;
-  //free_wrapper((void**) &ie);
+  // free_wrapper((void**) &ie);
 }
 
 void DownlinkRANStatusTransfer::setRANStatusTransfer_TransparentContainer(
@@ -91,8 +91,8 @@ void DownlinkRANStatusTransfer::setRANStatusTransfer_TransparentContainer(
     ranStatusTransfer_TransparentContainer =
         new RANStatusTransferTransparentContainer();
   }
-  Ngap_DRB_ID_t* dRB_id = (Ngap_DRB_ID_t*) calloc(1, sizeof(Ngap_DRB_ID_t));
-  dRB_id                = &drb_id;
+  // Ngap_DRB_ID_t* dRB_id = (Ngap_DRB_ID_t*) calloc(1, sizeof(Ngap_DRB_ID_t));
+  // dRB_id                = &drb_id;
   COUNTValueForPDCP_SN18* UL_value =
       (COUNTValueForPDCP_SN18*) calloc(1, sizeof(COUNTValueForPDCP_SN18));
   UL_value->setvalue(ul_pcdp, ul_hfn_pdcp);
@@ -108,7 +108,7 @@ void DownlinkRANStatusTransfer::setRANStatusTransfer_TransparentContainer(
   dRBStatusUL* UL = (dRBStatusUL*) calloc(1, sizeof(dRBStatusUL));
   UL->setdRBStatusUL(UL18);
   dRBSubjectItem* m_item = (dRBSubjectItem*) calloc(1, sizeof(dRBSubjectItem));
-  m_item->setdRBSubjectItem(dRB_id, UL, DL);
+  m_item->setdRBSubjectItem(&drb_id, UL, DL);
   dRBSubjectList* m_list = (dRBSubjectList*) calloc(1, sizeof(dRBSubjectList));
   m_list->setdRBSubjectItem(m_item, 1);
   ranStatusTransfer_TransparentContainer->setdRBSubject_list(m_list);
@@ -124,7 +124,7 @@ void DownlinkRANStatusTransfer::setRANStatusTransfer_TransparentContainer(
                      &ie->value.choice.RANStatusTransfer_TransparentContainer);
   if (!ret) {
     cout << "encode ranstatustransfer_transparentcontainer error" << endl;
-    free_wrapper((void**) &dRB_id);
+    // free_wrapper((void**) &dRB_id);
     free_wrapper((void**) &UL_value);
     free_wrapper((void**) &DL_value);
     free_wrapper((void**) &UL18);
@@ -139,17 +139,17 @@ void DownlinkRANStatusTransfer::setRANStatusTransfer_TransparentContainer(
       0) {
     cout << "encode ranstatustransfer_transparentcontainer error 2" << endl;
   }
- /* free_wrapper((void**) &dRB_id);
-  free_wrapper((void**) &UL_value);
-  free_wrapper((void**) &DL_value);
-  free_wrapper((void**) &UL18);
-  free_wrapper((void**) &DL18);
-  free_wrapper((void**) &DL);
-  free_wrapper((void**) &UL);
-  free_wrapper((void**) &m_list);
-  free_wrapper((void**) &m_item);
-  free_wrapper((void**) &ie);
-  */
+  /* free_wrapper((void**) &dRB_id);
+   free_wrapper((void**) &UL_value);
+   free_wrapper((void**) &DL_value);
+   free_wrapper((void**) &UL18);
+   free_wrapper((void**) &DL18);
+   free_wrapper((void**) &DL);
+   free_wrapper((void**) &UL);
+   free_wrapper((void**) &m_list);
+   free_wrapper((void**) &m_item);
+   free_wrapper((void**) &ie);
+   */
 }
 void DownlinkRANStatusTransfer::setmessagetype() {
   if (!DownlinkranstatustransferPDU) {

src/ngap/ngapMsgs/PduSessionResourceSetupRequest.cpp

@@ -113,7 +113,7 @@ void PduSessionResourceSetupRequestMsg::setAmfUeNgapId(unsigned long id) {
   ret = ASN_SEQUENCE_ADD(
       &pduSessionResourceSetupRequestIEs->protocolIEs.list, ie);
   if (ret != 0) cout << "encode AMF_UE_NGAP_ID IE error" << endl;
-  //free_wrapper((void**) &ie);
+  // free_wrapper((void**) &ie);
 }
 
 //------------------------------------------------------------------------------
@@ -140,7 +140,7 @@ void PduSessionResourceSetupRequestMsg::setRanUeNgapId(
   ret = ASN_SEQUENCE_ADD(
       &pduSessionResourceSetupRequestIEs->protocolIEs.list, ie);
   if (ret != 0) cout << "encode RAN_UE_NGAP_ID IE error" << endl;
- //free_wrapper((void**) &ie);
+  // free_wrapper((void**) &ie);
 }
 
 //------------------------------------------------------------------------------
@@ -168,7 +168,7 @@ void PduSessionResourceSetupRequestMsg::setRanPagingPriority(uint8_t priority) {
   ret = ASN_SEQUENCE_ADD(
       &pduSessionResourceSetupRequestIEs->protocolIEs.list, ie);
   if (ret != 0) cout << "encode RANPagingPriority IE error" << endl;
-  //free_wrapper((void**) &ie);
+  // free_wrapper((void**) &ie);
 }
 
 //------------------------------------------------------------------------------
@@ -195,7 +195,7 @@ void PduSessionResourceSetupRequestMsg::setNasPdu(
   ret = ASN_SEQUENCE_ADD(
       &pduSessionResourceSetupRequestIEs->protocolIEs.list, ie);
   if (ret != 0) cout << "encode NAS_PDU IE error" << endl;
-  //free_wrapper((void**) &ie);
+  // free_wrapper((void**) &ie);
 }
 
 //------------------------------------------------------------------------------
@@ -247,7 +247,7 @@ void PduSessionResourceSetupRequestMsg::setPduSessionResourceSetupRequestList(
       &pduSessionResourceSetupRequestIEs->protocolIEs.list, ie);
   if (ret != 0)
     cout << "encode PDUSessionResourceSetupListSUReq IE error" << endl;
-  //free_wrapper((void**) &ie);
+  // free_wrapper((void**) &ie);
 }
 
 //------------------------------------------------------------------------------
@@ -262,6 +262,8 @@ void PduSessionResourceSetupRequestMsg::setPduSessionAggregateMaximumBitRate(
           1, sizeof(Ngap_PDUSessionResourceSetupRequestIEs_t));
   ie->id          = Ngap_ProtocolIE_ID_id_PDUSessionAggregateMaximumBitRate;
   ie->criticality = Ngap_Criticality_ignore;
+  free_wrapper((void**) &ie);
+  // TODO
 }
 
 //------------------------------------------------------------------------------