Addressed self comments

Signed-off-by: Rashmi <[email protected]>

Author: rsarwad

lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_handlers.cpp

@@ -396,7 +396,7 @@ void clean_stale_enb_state(oai::S1apState* state,
     if ((stale_enb_association.sctp_assoc_id() !=
          new_enb_association->sctp_assoc_id()) &&
         (stale_enb_association.enb_id() == new_enb_association->enb_id())) {
-      OAILOG_INFO(LOG_S1AP, "Found stale eNB at association id %d",
+      OAILOG_INFO(LOG_S1AP, "Found stale eNB at association id %u",
                   stale_enb_association.sctp_assoc_id());
       delete_state_enb = true;
       break;
@@ -3685,7 +3685,7 @@ status_code_e s1ap_handle_sctp_disconnection(oai::S1apState* state,
 
   // Checking if the assoc id has a valid eNB attached to it
   if ((s1ap_state_get_enb(state, assoc_id, &enb_association)) != PROTO_MAP_OK) {
-    OAILOG_ERROR(LOG_S1AP, "No eNB attached to this assoc_id: %d\n", assoc_id);
+    OAILOG_ERROR(LOG_S1AP, "No eNB attached to this assoc_id: %u\n", assoc_id);
     OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
   }
 
@@ -4914,7 +4914,7 @@ status_code_e s1ap_mme_handle_enb_configuration_transfer(
     OAILOG_FUNC_RETURN(LOG_S1AP, RETURNerror);
   }
 
-  if (enb_association.s1_enb_state() != magma::lte::oai::S1AP_READY) {
+  if (enb_association.s1_enb_state() != oai::S1AP_READY) {
     // ignore the message if s1 not ready
     OAILOG_INFO(
         LOG_S1AP,
@@ -5393,7 +5393,7 @@ static int handle_ue_context_rel_timer_expiry(zloop_t* loop, int timer_id,
   oai::UeDescription* ue_ref_p = nullptr;
   mme_ue_s1ap_id_t mme_ue_s1ap_id = 0;
   imsi64_t imsi64 = INVALID_IMSI64;
-  oai::S1apState* state = NULL;
+  oai::S1apState* state = nullptr;
   if (!s1ap_pop_timer_arg_ue_id(timer_id, &mme_ue_s1ap_id)) {
     OAILOG_WARNING(LOG_S1AP, "Invalid Timer Id expiration, Timer Id: %u\n",
                    timer_id);

lte/gateway/c/core/oai/tasks/s1ap/s1ap_mme_nas_procedures.cpp

@@ -1223,7 +1223,7 @@ void s1ap_handle_mme_ue_id_notification(
 
   magma::proto_map_uint32_uint64_t ue_id_coll;
   ue_id_coll.map = enb_ref.mutable_ue_id_map();
-  ue_id_coll.insert((const hash_key_t)mme_ue_s1ap_id, ue_ref->comp_s1ap_id());
+  ue_id_coll.insert(mme_ue_s1ap_id, ue_ref->comp_s1ap_id());
   s1ap_state_update_enb_map(state, sctp_assoc_id, &enb_ref);
 
   OAILOG_DEBUG(LOG_S1AP,

lte/gateway/c/core/oai/tasks/s1ap/s1ap_state_manager.cpp

@@ -104,15 +104,14 @@ void free_s1ap_state(oai::S1apState* state_cache_p) {
   AssertFatal(state_cache_p,
               "S1apState passed to free_s1ap_state must not be null");
 
-  oai::EnbDescription enb;
   proto_map_uint32_enb_description_t enb_map;
   enb_map.map = state_cache_p->mutable_enbs();
 
   if (enb_map.isEmpty()) {
     OAILOG_DEBUG(LOG_S1AP, "No keys in the enb map");
   } else {
     for (auto itr = enb_map.map->begin(); itr != enb_map.map->end(); itr++) {
-      enb = itr->second;
+      oai::EnbDescription enb = itr->second;
       enb.clear_ue_id_map();
     }
   }
@@ -230,19 +229,17 @@ map_uint64_ue_description_t* S1apStateManager::get_s1ap_ue_state() {
 }
 
 oai::S1apState* S1apStateManager::get_state(bool read_from_db) {
-  OAILOG_FUNC_IN(LOG_AMF_APP);
+  OAILOG_FUNC_IN(LOG_S1AP);
   AssertFatal(
       is_initialized,
       "S1apStateManager init() function should be called to initialize state");
-  // TODO: Add check for reentrant read/write function, to block multiple
-  // reads
   state_dirty = true;
   AssertFatal(state_cache_p != nullptr, " S1ap State cache is NULL");
   if (persist_state_enabled && read_from_db) {
     read_state_from_db();
     read_ue_state_from_db();
   }
-  OAILOG_FUNC_RETURN(LOG_AMF_APP, state_cache_p);
+  OAILOG_FUNC_RETURN(LOG_S1AP, state_cache_p);
 }
 
 void S1apStateManager::write_s1ap_state_to_db() {