From f9dabfa8310f5c8dff9b4ea3074b51a6ceef9b02 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Mon, 13 Feb 2017 00:04:02 +0900 Subject: [PATCH] remove reduant code for free routine --- lib/asn/src/s1ap_free.c | 157 +++++++--------------------------------- 1 file changed, 28 insertions(+), 129 deletions(-) diff --git a/lib/asn/src/s1ap_free.c b/lib/asn/src/s1ap_free.c index 485c74ae5..3ceecf18c 100644 --- a/lib/asn/src/s1ap_free.c +++ b/lib/asn/src/s1ap_free.c @@ -7,34 +7,6 @@ static inline int s1ap_free_initiating_message(s1ap_message *message_p); static inline int s1ap_free_successfull_outcome(s1ap_message *message_p); static inline int s1ap_free_unsuccessfull_outcome(s1ap_message *message_p); -static inline void s1ap_free_s1setup_request(s1ap_message *message_p); -static inline void s1ap_free_s1setup_response(s1ap_message *message_p); -static inline void s1ap_free_s1setup_failure(s1ap_message *message_p); - -static inline void s1ap_free_initialuemessage_ies(s1ap_message *message_p); -static inline void s1ap_free_uecapabilityinfoindicationies( - s1ap_message *message_p); - -static inline void s1ap_free_initial_context_setup_request( - s1ap_message *message_p); -static inline void s1ap_free_initialcontextsetupresponseies( - s1ap_message *message_p); -static inline void s1ap_free_initialcontextsetupfailureies( - s1ap_message *message_p); - -static inline void s1ap_free_downlink_nas_transport(s1ap_message *message_p); -static inline void s1ap_free_uplinknastransport_ies(s1ap_message *message_p); -static inline void s1ap_free_nasnondeliveryindication_ies( - s1ap_message *message_p); - -static inline void s1ap_free_ue_context_release_command( - s1ap_message *message_p); -static inline void s1ap_free_uecontextreleasecomplete_ies( - s1ap_message *message_p); -static inline void s1ap_free_uecontextreleaserequest_ies( - s1ap_message *message_p); - - int s1ap_free_pdu(s1ap_message *message_p) { d_assert (message_p, return -1, "Null param"); @@ -64,39 +36,48 @@ static inline int s1ap_free_initiating_message(s1ap_message *message_p) switch (message_p->procedureCode) { case S1ap_ProcedureCode_id_S1Setup: - s1ap_free_s1setup_request(message_p); + s1ap_free_s1ap_s1setuprequesties( + &message_p->msg.s1ap_S1SetupRequestIEs); break; case S1ap_ProcedureCode_id_initialUEMessage: - s1ap_free_initialuemessage_ies(message_p); + s1ap_free_s1ap_initialuemessage_ies( + &message_p->msg.s1ap_InitialUEMessage_IEs); break; case S1ap_ProcedureCode_id_UECapabilityInfoIndication: - s1ap_free_uecapabilityinfoindicationies(message_p); + s1ap_free_s1ap_uecapabilityinfoindicationies( + &message_p->msg.s1ap_UECapabilityInfoIndicationIEs); break; case S1ap_ProcedureCode_id_InitialContextSetup: - s1ap_free_initial_context_setup_request(message_p); + s1ap_free_s1ap_initialcontextsetuprequesties( + &message_p->msg.s1ap_InitialContextSetupRequestIEs); break; case S1ap_ProcedureCode_id_downlinkNASTransport: - s1ap_free_downlink_nas_transport(message_p); + s1ap_free_s1ap_downlinknastransport_ies( + &message_p->msg.s1ap_DownlinkNASTransport_IEs); break; case S1ap_ProcedureCode_id_uplinkNASTransport: - s1ap_free_uplinknastransport_ies(message_p); + s1ap_free_s1ap_uplinknastransport_ies( + &message_p->msg.s1ap_UplinkNASTransport_IEs); break; case S1ap_ProcedureCode_id_NASNonDeliveryIndication: - s1ap_free_nasnondeliveryindication_ies(message_p); + s1ap_free_s1ap_nasnondeliveryindication_ies( + &message_p->msg.s1ap_NASNonDeliveryIndication_IEs); break; case S1ap_ProcedureCode_id_UEContextRelease: - s1ap_free_ue_context_release_command(message_p); + s1ap_free_s1ap_uecontextreleasecommand_ies( + &message_p->msg.s1ap_UEContextReleaseCommand_IEs); break; case S1ap_ProcedureCode_id_UEContextReleaseRequest: - s1ap_free_uecontextreleaserequest_ies(message_p); + s1ap_free_s1ap_uecontextreleaserequest_ies( + &message_p->msg.s1ap_UEContextReleaseRequest_IEs); break; default: @@ -113,15 +94,18 @@ static inline int s1ap_free_successfull_outcome(s1ap_message *message_p) switch (message_p->procedureCode) { case S1ap_ProcedureCode_id_S1Setup: - s1ap_free_s1setup_response(message_p); + s1ap_free_s1ap_s1setupresponseies( + &message_p->msg.s1ap_S1SetupResponseIEs); break; case S1ap_ProcedureCode_id_InitialContextSetup: - s1ap_free_initialcontextsetupresponseies(message_p); + s1ap_free_s1ap_initialcontextsetupresponseies( + &message_p->msg.s1ap_InitialContextSetupResponseIEs); break; case S1ap_ProcedureCode_id_UEContextRelease: - s1ap_free_uecontextreleasecomplete_ies(message_p); + s1ap_free_s1ap_uecontextreleasecomplete_ies( + &message_p->msg.s1ap_UEContextReleaseComplete_IEs); break; default: @@ -138,11 +122,13 @@ static inline int s1ap_free_unsuccessfull_outcome(s1ap_message *message_p) switch (message_p->procedureCode) { case S1ap_ProcedureCode_id_S1Setup: - s1ap_free_s1setup_failure(message_p); + s1ap_free_s1ap_s1setupfailureies( + &message_p->msg.s1ap_S1SetupFailureIEs); break; case S1ap_ProcedureCode_id_InitialContextSetup: - s1ap_free_initialcontextsetupfailureies(message_p); + s1ap_free_s1ap_initialcontextsetupfailureies( + &message_p->msg.s1ap_InitialContextSetupFailureIEs); break; default: @@ -153,90 +139,3 @@ static inline int s1ap_free_unsuccessfull_outcome(s1ap_message *message_p) return 0; } - -static inline void s1ap_free_s1setup_request(s1ap_message *message_p) -{ - s1ap_free_s1ap_s1setuprequesties(&message_p->msg.s1ap_S1SetupRequestIEs); -} - -static inline void s1ap_free_s1setup_response(s1ap_message *message_p) -{ - s1ap_free_s1ap_s1setupresponseies( - &message_p->msg.s1ap_S1SetupResponseIEs); -} - -static inline void s1ap_free_s1setup_failure(s1ap_message *message_p) -{ - s1ap_free_s1ap_s1setupfailureies(&message_p->msg.s1ap_S1SetupFailureIEs); -} - -static inline void s1ap_free_initialuemessage_ies(s1ap_message *message_p) -{ - s1ap_free_s1ap_initialuemessage_ies( - &message_p->msg.s1ap_InitialUEMessage_IEs); -} - -static inline void s1ap_free_initial_context_setup_request( - s1ap_message *message_p) -{ - s1ap_free_s1ap_initialcontextsetuprequesties( - &message_p->msg.s1ap_InitialContextSetupRequestIEs); -} -static inline void s1ap_free_initialcontextsetupresponseies( - s1ap_message *message_p) -{ - s1ap_free_s1ap_initialcontextsetupresponseies( - &message_p->msg.s1ap_InitialContextSetupResponseIEs); -} -static inline void s1ap_free_initialcontextsetupfailureies( - s1ap_message *message_p) -{ - s1ap_free_s1ap_initialcontextsetupfailureies( - &message_p->msg.s1ap_InitialContextSetupFailureIEs); -} - -static inline void s1ap_free_downlink_nas_transport(s1ap_message *message_p) -{ - s1ap_free_s1ap_downlinknastransport_ies( - &message_p->msg.s1ap_DownlinkNASTransport_IEs); -} - -static inline void s1ap_free_uplinknastransport_ies(s1ap_message *message_p) -{ - s1ap_free_s1ap_uplinknastransport_ies( - &message_p->msg.s1ap_UplinkNASTransport_IEs); -} - -static inline void s1ap_free_ue_context_release_command( - s1ap_message *message_p) -{ - s1ap_free_s1ap_uecontextreleasecommand_ies( - &message_p->msg.s1ap_UEContextReleaseCommand_IEs); -} - -static inline void s1ap_free_uecontextreleaserequest_ies( - s1ap_message *message_p) -{ - s1ap_free_s1ap_uecontextreleaserequest_ies( - &message_p->msg.s1ap_UEContextReleaseRequest_IEs); -} -static inline void s1ap_free_uecapabilityinfoindicationies( - s1ap_message *message_p) -{ - s1ap_free_s1ap_uecapabilityinfoindicationies( - &message_p->msg.s1ap_UECapabilityInfoIndicationIEs); -} -static inline void s1ap_free_nasnondeliveryindication_ies( - s1ap_message *message_p) -{ - s1ap_free_s1ap_nasnondeliveryindication_ies( - &message_p->msg.s1ap_NASNonDeliveryIndication_IEs); -} - -static inline void s1ap_free_uecontextreleasecomplete_ies( - s1ap_message *message_p) -{ - s1ap_free_s1ap_uecontextreleasecomplete_ies( - &message_p->msg.s1ap_UEContextReleaseComplete_IEs); -} -