From f51d167ae2efe3bc717c0a8429088e4282d7032e Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Thu, 11 Feb 2016 07:19:23 +0100 Subject: [PATCH] Q932: fix q932_.._vals defined but not used [-Werror=unused-const-variable] found by gcc6 Change-Id: I0b059caa0caa3fbd0ee54aa18327a948a67c4774 Reviewed-on: https://code.wireshark.org/review/13899 Reviewed-by: Anders Broman --- asn1/q932/q932.cnf | 2 +- epan/dissectors/packet-q932.c | 57 +++++++++++++++++++++++++++++++ epan/dissectors/packet-q932.h | 64 ++++------------------------------- 3 files changed, 65 insertions(+), 58 deletions(-) diff --git a/asn1/q932/q932.cnf b/asn1/q932/q932.cnf index e5bcf3b968..b2dbcb4da0 100644 --- a/asn1/q932/q932.cnf +++ b/asn1/q932/q932.cnf @@ -8,7 +8,7 @@ InterpretationComponent NetworkFacilityExtension NetworkProtocolProfile -#.EXPORTS EXTERN VALS_WITH_TABLE +#.EXPORTS EXTERN # Addressing-Data-Elements PresentedAddressScreened diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c index 2a3c670e1f..f4987644b4 100644 --- a/epan/dissectors/packet-q932.c +++ b/epan/dissectors/packet-q932.c @@ -302,6 +302,17 @@ dissect_q932_PrivatePartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in } +const value_string q932_PartyNumber_vals[] = { + { 0, "unknownPartyNumber" }, + { 1, "publicPartyNumber" }, + { 2, "nsapEncodedNumber" }, + { 3, "dataPartyNumber" }, + { 4, "telexPartyNumber" }, + { 5, "privatePartyNumber" }, + { 8, "nationalStandardPartyNumber" }, + { 0, NULL } +}; + static const ber_choice_t PartyNumber_choice[] = { { 0, &hf_q932_unknownPartyNumber, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_q932_NumberDigits }, { 1, &hf_q932_publicPartyNumber, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_q932_PublicPartyNumber }, @@ -323,6 +334,14 @@ dissect_q932_PartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse } +const value_string q932_ScreeningIndicator_vals[] = { + { 0, "userProvidedNotScreened" }, + { 1, "userProvidedVerifiedAndPassed" }, + { 2, "userProvidedVerifiedAndFailed" }, + { 3, "networkProvided" }, + { 0, NULL } +}; + int dissect_q932_ScreeningIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -377,6 +396,12 @@ dissect_q932_NSAPSubaddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } +const value_string q932_PartySubaddress_vals[] = { + { 0, "userSpecifiedSubaddress" }, + { 1, "nSAPSubaddress" }, + { 0, NULL } +}; + static const ber_choice_t PartySubaddress_choice[] = { { 0, &hf_q932_userSpecifiedSubaddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_q932_UserSpecifiedSubaddress }, { 1, &hf_q932_nSAPSubaddress , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_q932_NSAPSubaddress }, @@ -418,6 +443,14 @@ dissect_q932_NULL(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, } +const value_string q932_PresentedAddressScreened_vals[] = { + { 0, "presentationAlIowedAddress" }, + { 1, "presentationRestricted" }, + { 2, "numberNotAvailableDueTolnterworking" }, + { 3, "presentationRestrictedAddress" }, + { 0, NULL } +}; + static const ber_choice_t PresentedAddressScreened_choice[] = { { 0, &hf_q932_presentationAlIowedAddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_q932_AddressScreened }, { 1, &hf_q932_presentationRestricted, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_q932_NULL }, @@ -451,6 +484,14 @@ dissect_q932_Address(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } +const value_string q932_PresentedAddressUnscreened_vals[] = { + { 0, "presentationAllowedAddress" }, + { 1, "presentationRestricted" }, + { 2, "numberNotAvailableDueTolnterworking" }, + { 3, "presentationRestrictedAddress" }, + { 0, NULL } +}; + static const ber_choice_t PresentedAddressUnscreened_choice[] = { { 0, &hf_q932_presentationAllowedAddress, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_q932_Address }, { 1, &hf_q932_presentationRestricted, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_q932_NULL }, @@ -484,6 +525,14 @@ dissect_q932_NumberScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } +const value_string q932_PresentedNumberScreened_vals[] = { + { 0, "presentationAllowedNumber" }, + { 1, "presentationRestricted" }, + { 2, "numberNotAvailableDueToInterworking" }, + { 3, "presentationRestrictedNumber" }, + { 0, NULL } +}; + static const ber_choice_t PresentedNumberScreened_choice[] = { { 0, &hf_q932_presentationAllowedNumberScreened, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_q932_NumberScreened }, { 1, &hf_q932_presentationRestricted, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_q932_NULL }, @@ -502,6 +551,14 @@ dissect_q932_PresentedNumberScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U } +const value_string q932_PresentedNumberUnscreened_vals[] = { + { 0, "presentationAllowedNumber" }, + { 1, "presentationRestricted" }, + { 2, "numberNotAvailableDueToInterworking" }, + { 3, "presentationRestrictedNumber" }, + { 0, NULL } +}; + static const ber_choice_t PresentedNumberUnscreened_choice[] = { { 0, &hf_q932_presentationAllowedNumber, BER_CLASS_CON, 0, 0, dissect_q932_PartyNumber }, { 1, &hf_q932_presentationRestricted, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_q932_NULL }, diff --git a/epan/dissectors/packet-q932.h b/epan/dissectors/packet-q932.h index 454f47d631..361878bbc3 100644 --- a/epan/dissectors/packet-q932.h +++ b/epan/dissectors/packet-q932.h @@ -35,63 +35,13 @@ /*--- Included file: packet-q932-exp.h ---*/ #line 1 "../../asn1/q932/packet-q932-exp.h" - -static const value_string q932_PresentedAddressScreened_vals[] = { - { 0, "presentationAlIowedAddress" }, - { 1, "presentationRestricted" }, - { 2, "numberNotAvailableDueTolnterworking" }, - { 3, "presentationRestrictedAddress" }, - { 0, NULL } -}; - -static const value_string q932_PresentedAddressUnscreened_vals[] = { - { 0, "presentationAllowedAddress" }, - { 1, "presentationRestricted" }, - { 2, "numberNotAvailableDueTolnterworking" }, - { 3, "presentationRestrictedAddress" }, - { 0, NULL } -}; - -static const value_string q932_PresentedNumberScreened_vals[] = { - { 0, "presentationAllowedNumber" }, - { 1, "presentationRestricted" }, - { 2, "numberNotAvailableDueToInterworking" }, - { 3, "presentationRestrictedNumber" }, - { 0, NULL } -}; - -static const value_string q932_PresentedNumberUnscreened_vals[] = { - { 0, "presentationAllowedNumber" }, - { 1, "presentationRestricted" }, - { 2, "numberNotAvailableDueToInterworking" }, - { 3, "presentationRestrictedNumber" }, - { 0, NULL } -}; - -static const value_string q932_PartyNumber_vals[] = { - { 0, "unknownPartyNumber" }, - { 1, "publicPartyNumber" }, - { 2, "nsapEncodedNumber" }, - { 3, "dataPartyNumber" }, - { 4, "telexPartyNumber" }, - { 5, "privatePartyNumber" }, - { 8, "nationalStandardPartyNumber" }, - { 0, NULL } -}; - -static const value_string q932_PartySubaddress_vals[] = { - { 0, "userSpecifiedSubaddress" }, - { 1, "nSAPSubaddress" }, - { 0, NULL } -}; - -static const value_string q932_ScreeningIndicator_vals[] = { - { 0, "userProvidedNotScreened" }, - { 1, "userProvidedVerifiedAndPassed" }, - { 2, "userProvidedVerifiedAndFailed" }, - { 3, "networkProvided" }, - { 0, NULL } -}; +extern const value_string q932_PresentedAddressScreened_vals[]; +extern const value_string q932_PresentedAddressUnscreened_vals[]; +WS_DLL_PUBLIC const value_string q932_PresentedNumberScreened_vals[]; +WS_DLL_PUBLIC const value_string q932_PresentedNumberUnscreened_vals[]; +WS_DLL_PUBLIC const value_string q932_PartyNumber_vals[]; +WS_DLL_PUBLIC const value_string q932_PartySubaddress_vals[]; +extern const value_string q932_ScreeningIndicator_vals[]; extern int dissect_q932_PresentedAddressScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); extern int dissect_q932_PresentedAddressUnscreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_); WS_DLL_PUBLIC int dissect_q932_PresentedNumberScreened(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);