From 4a14c4c706400311326adab8e2a8dad73bdf79a4 Mon Sep 17 00:00:00 2001 From: Wu Jing Date: Mon, 13 Apr 2020 14:37:50 +0900 Subject: [PATCH] fix build waning (cherry picked from commit 624fe21f52117959940066a6cfc5f8beac70e462) # Conflicts: # openair2/LAYER2/MAC/eNB_scheduler_RA.c # openair2/LAYER2/MAC/eNB_scheduler_dlsch.c # openair2/LAYER2/MAC/eNB_scheduler_fairRR.c # openair3/S1AP/s1ap_eNB.c # Conflicts: # openair3/S1AP/s1ap_eNB.c --- openair3/S1AP/s1ap_eNB.c | 4 ++-- openair3/S1AP/s1ap_eNB_handlers.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openair3/S1AP/s1ap_eNB.c b/openair3/S1AP/s1ap_eNB.c index 9eebb68fe7..742766909b 100644 --- a/openair3/S1AP/s1ap_eNB.c +++ b/openair3/S1AP/s1ap_eNB.c @@ -105,7 +105,7 @@ static void s1ap_eNB_register_mme(s1ap_eNB_instance_t *instance_p, MessageDef *message_p = NULL; sctp_new_association_req_t *sctp_new_association_req_p = NULL; s1ap_eNB_mme_data_t *s1ap_mme_data_p = NULL; - struct s1ap_eNB_mme_data_s *mme = NULL; +// struct s1ap_eNB_mme_data_s *mme = NULL; DevAssert(instance_p != NULL); DevAssert(mme_ip_address != NULL); message_p = itti_alloc_new_message(TASK_S1AP, SCTP_NEW_ASSOCIATION_REQ); @@ -666,7 +666,7 @@ void *s1ap_eNB_process_itti_msg(void *notUsed) { case TIMER_HAS_EXPIRED: { s1ap_eNB_timer_expired(ITTI_MESSAGE_GET_INSTANCE(received_msg), - &TIMER_HAS_EXPIRED(received_msg)); + (s1ap_timer_has_expired_t *) &TIMER_HAS_EXPIRED(received_msg)); } break; diff --git a/openair3/S1AP/s1ap_eNB_handlers.c b/openair3/S1AP/s1ap_eNB_handlers.c index 5d43c5b3fa..89f82fa485 100644 --- a/openair3/S1AP/s1ap_eNB_handlers.c +++ b/openair3/S1AP/s1ap_eNB_handlers.c @@ -38,6 +38,9 @@ #include "s1ap_eNB_defs.h" #include "s1ap_eNB_handlers.h" #include "s1ap_eNB_decoder.h" +#include "s1ap_eNB_encoder.h" + +#include "s1ap_eNB_itti_messaging.h" #include "s1ap_eNB_ue_context.h" #include "s1ap_eNB_trace.h" @@ -818,7 +821,7 @@ int s1ap_eNB_handle_error_indication(uint32_t assoc_id, if (ie) { if( ie->value.choice.CriticalityDiagnostics.procedureCode ) { - S1AP_WARN("Received S1 Error indication CriticalityDiagnostics procedureCode = %d\n", *ie->value.choice.CriticalityDiagnostics.procedureCode); + S1AP_WARN("Received S1 Error indication CriticalityDiagnostics procedureCode = %ld\n", *ie->value.choice.CriticalityDiagnostics.procedureCode); } // TODO continue }