aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-02-05 13:18:57 +0000
committerMichael Mann <mmann78@netscape.net>2016-02-06 13:00:47 +0000
commita86e2107221024745fd8b2a3a0ed5e0fe9ba67f1 (patch)
tree0e0b6956ba1c506467d6f79f2479c0f78e4240ae
parentc59f6ccd310900bbe7bfccde9ec6a42838d62fee (diff)
TCAP: Fix dissect_tcap_ERROR() unused warning [-Wunused-function]
Change-Id: I0d9511ed9cb93446766d510b97fdefe56a86a826 Reviewed-on: https://code.wireshark.org/review/13787 Petri-Dish: João Valverde <j@v6e.pt> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--asn1/tcap/tcap.cnf2
-rw-r--r--epan/dissectors/packet-tcap.c18
2 files changed, 1 insertions, 19 deletions
diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf
index b8f807ebad..b56b2217e3 100644
--- a/asn1/tcap/tcap.cnf
+++ b/asn1/tcap/tcap.cnf
@@ -6,6 +6,7 @@ RLRQ-apdu
RLRE-apdu
Release-request-reason
Release-response-reason
+ERROR
#.END
#.MODULE_IMPORT
@@ -23,7 +24,6 @@ UniDialoguePDU B "0.0.17.773.1.2.1" "id-as-uniDialogue"
#.NO_EMIT ONLY_VALS
TCMessage
-ERROR
#.NO_EMIT
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 8559100507..eba7d1d1ab 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -173,7 +173,6 @@ static gint ett_tcap_Reject = -1;
static gint ett_tcap_T_invokeIDRej = -1;
static gint ett_tcap_T_problem = -1;
static gint ett_tcap_OPERATION = -1;
-static gint ett_tcap_ERROR = -1;
static gint ett_tcap_ErrorCode = -1;
static gint ett_tcap_UniDialoguePDU = -1;
static gint ett_tcap_AUDT_apdu_U = -1;
@@ -1002,22 +1001,6 @@ dissect_tcap_TCMessage(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
}
-static const ber_choice_t ERROR_choice[] = {
- { 0, &hf_tcap_localValue , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_tcap_INTEGER },
- { 1, &hf_tcap_globalValue , BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_tcap_OBJECT_IDENTIFIER },
- { 0, NULL, 0, 0, 0, NULL }
-};
-
-static int
-dissect_tcap_ERROR(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_ber_choice(actx, tree, tvb, offset,
- ERROR_choice, hf_index, ett_tcap_ERROR,
- NULL);
-
- return offset;
-}
-
-
static const asn_namedbit AUDT_protocol_version_bits[] = {
{ 0, &hf_tcap_AUDT_protocol_version_version1, -1, -1, "version1", NULL },
{ 0, NULL, 0, 0, NULL, NULL }
@@ -3716,7 +3699,6 @@ proto_register_tcap(void)
&ett_tcap_T_invokeIDRej,
&ett_tcap_T_problem,
&ett_tcap_OPERATION,
- &ett_tcap_ERROR,
&ett_tcap_ErrorCode,
&ett_tcap_UniDialoguePDU,
&ett_tcap_AUDT_apdu_U,