diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-12-21 10:52:29 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-12-21 10:52:29 +0000 |
| commit | 69270d1bea3e1ebc6e04dc07b6331706d89e659c (patch) | |
| tree | 58067f353cde32ad08eb4744cddb5a911eb50ce1 | |
| parent | 594e855738fbf2419e72f7c9c6af484f09f8a701 (diff) | |
| download | wireshark-69270d1bea3e1ebc6e04dc07b6331706d89e659c.tar.gz | |
Get rid of unused routines for UDC-type.
svn path=/trunk/; revision=46662
| -rw-r--r-- | asn1/pres/pres.cnf | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-pres.c | 18 |
2 files changed, 1 insertions, 19 deletions
diff --git a/asn1/pres/pres.cnf b/asn1/pres/pres.cnf index 01d56074e5..6fab8901d1 100644 --- a/asn1/pres/pres.cnf +++ b/asn1/pres/pres.cnf @@ -9,9 +9,9 @@ #.PDU UD-type -UDC-type #.NO_EMIT +UDC-type #.TYPE_RENAME CPA-PPDU/normal-mode-parameters T_CPA_PPDU_normal_mode_parameters diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 91a7c4593b..62d8266907 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -103,7 +103,6 @@ static int hf_pres_Typed_data_type = -1; /*--- Included file: packet-pres-hf.c ---*/ #line 1 "../../asn1/pres/packet-pres-hf.c" static int hf_pres_UD_type_PDU = -1; /* UD_type */ -static int hf_pres_UDC_type_PDU = -1; /* UDC_type */ static int hf_pres_mode_selector = -1; /* Mode_selector */ static int hf_pres_x410_mode_parameters = -1; /* RTORQapdu */ static int hf_pres_normal_mode_parameters = -1; /* T_normal_mode_parameters */ @@ -1348,14 +1347,6 @@ dissect_pres_UD_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U } - -static int -dissect_pres_UDC_type(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_pres_User_data(implicit_tag, tvb, offset, actx, tree, hf_index); - - return offset; -} - /*--- PDUs ---*/ static void dissect_UD_type_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { @@ -1363,11 +1354,6 @@ static void dissect_UD_type_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); dissect_pres_UD_type(FALSE, tvb, 0, &asn1_ctx, tree, hf_pres_UD_type_PDU); } -static void dissect_UDC_type_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { - asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - dissect_pres_UDC_type(FALSE, tvb, 0, &asn1_ctx, tree, hf_pres_UDC_type_PDU); -} /*--- End of included file: packet-pres-fn.c ---*/ @@ -1549,10 +1535,6 @@ void proto_register_pres(void) { { "UD-type", "pres.UD_type", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_pres_UDC_type_PDU, - { "UDC-type", "pres.UDC_type", - FT_UINT32, BASE_DEC, VALS(pres_User_data_vals), 0, - NULL, HFILL }}, { &hf_pres_mode_selector, { "mode-selector", "pres.mode_selector", FT_NONE, BASE_NONE, NULL, 0, |