From 600cce17c72ede912cbcf8991b925cfcd7312875 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Tue, 29 Mar 2016 12:00:57 +0200
Subject: [PATCH] more warning removals

---
 openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c | 2 +-
 openair2/RRC/LITE/rrc_eNB.c              | 1 +
 openair3/NAS/TOOLS/ue_data.c             | 2 +-
 openair3/NAS/UE/EMM/SAP/emm_reg.c        | 3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
index d7e1fe355..8ac79a61b 100755
--- a/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+++ b/openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
@@ -494,7 +494,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const  ctxt_pP)
                   pdcp_read_header_g.inst +  oai_emulation.info.first_enb_local;*/
 #else // OAI_EMU
           pdcp_read_header_g.inst = 0;
-#warning "TO DO CORRCT VALUES FOR ue mod id, enb mod id"
+//#warning "TO DO CORRCT VALUES FOR ue mod id, enb mod id"
           ctxt.frame         = ctxt_cpy.frame;
           ctxt.enb_flag      = ctxt_cpy.enb_flag;
 
diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index 4c8e3d9d6..42e28f752 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -1294,6 +1294,7 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration(
 
   /* avoid gcc warnings */
   (void)PDCP_rlc_AM;
+  (void)PDCP_rlc_UM;
 
 #ifdef RRC_DEFAULT_RAB_IS_AM // EXMIMO_IOT
   PDCP_rlc_AM = CALLOC(1, sizeof(*PDCP_rlc_AM));
diff --git a/openair3/NAS/TOOLS/ue_data.c b/openair3/NAS/TOOLS/ue_data.c
index 478119acd..5a463ad09 100644
--- a/openair3/NAS/TOOLS/ue_data.c
+++ b/openair3/NAS/TOOLS/ue_data.c
@@ -481,7 +481,7 @@ static void _display_emm_data(const emm_nvdata_t* data)
              data->imsi.u.num.digit13,
              data->imsi.u.num.digit14);
     } else {
-      printf("%u%u%u.%u%u%u.%u%u%u%u%u%u%u%u\n",
+      printf("%u%u%u.%u%u%u.%u%u%u%u%u%u%u%u%u\n",
              data->imsi.u.num.digit1,
              data->imsi.u.num.digit2,
              data->imsi.u.num.digit3,
diff --git a/openair3/NAS/UE/EMM/SAP/emm_reg.c b/openair3/NAS/UE/EMM/SAP/emm_reg.c
index 7f20b2515..b73f75975 100755
--- a/openair3/NAS/UE/EMM/SAP/emm_reg.c
+++ b/openair3/NAS/UE/EMM/SAP/emm_reg.c
@@ -114,6 +114,9 @@ int emm_reg_send(const emm_reg_t *msg)
   emm_reg_primitive_t primitive = msg->primitive;
   assert( (primitive > _EMMREG_START) && (primitive < _EMMREG_END));
 
+  /* avoid gcc warnings */
+  (void)primitive;
+
   /* Execute the EMM procedure */
   rc = emm_fsm_process(msg);
 
-- 
GitLab