diff options
-rw-r--r-- | epan/dissectors/packet-ansi_637.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-ansi_683.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-ansi_801.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-asterix.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-bacapp.c | 7 | ||||
-rw-r--r-- | epan/dissectors/packet-bpdu.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-brdwlk.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-cimetrics.c | 5 | ||||
-rw-r--r-- | epan/dissectors/packet-cpfi.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-erldp.c | 5 | ||||
-rw-r--r-- | epan/dissectors/packet-etv.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-fcdns.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-fcsp.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-gmr1_bcch.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-gmr1_dtap.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-gtp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-hpteam.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-sbc.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-sdh.c | 5 |
19 files changed, 1 insertions, 83 deletions
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c index c396126041..bd23336d2f 100644 --- a/epan/dissectors/packet-ansi_637.c +++ b/epan/dissectors/packet-ansi_637.c @@ -204,7 +204,6 @@ static guint32 ansi_637_trans_tele_id; static char ansi_637_bigbuf[1024]; static char gsm_637_bigbuf[1024]; static char ia5_637_bigbuf[1024]; -/* static dissector_handle_t data_handle; */ static dissector_table_t tele_dissector_table; static packet_info *g_pinfo; static proto_tree *g_tree; @@ -2380,6 +2379,4 @@ proto_reg_handoff_ansi_637(void) * ANSI A-interface will push out transport layer data */ dissector_add_uint("ansi_a.sms", 0, ansi_637_trans_handle); - - /* data_handle = find_dissector("data"); */ } diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c index 01fef3d076..1e47b22353 100644 --- a/epan/dissectors/packet-ansi_683.c +++ b/epan/dissectors/packet-ansi_683.c @@ -78,7 +78,6 @@ static int hf_ansi_683_rev_msg_type = -1; static int hf_ansi_683_length = -1; static char bigbuf[1024]; -static dissector_handle_t data_handle; static const char dtmf_digits[16] = {'?','1','2','3','4','5','6','7','8','9','0','?','?','?','?','?'}; static const char bcd_digits[16] = {'0','1','2','3','4','5','6','7','8','9','?','?','?','?','?','?'}; @@ -4840,6 +4839,4 @@ proto_reg_handoff_ansi_683(void) dissector_add_uint("ansi_map.ota", ANSI_683_REVERSE, ansi_683_handle); dissector_add_uint("ansi_a.ota", ANSI_683_FORWARD, ansi_683_handle); dissector_add_uint("ansi_a.ota", ANSI_683_REVERSE, ansi_683_handle); - - data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c index 060141eba6..2db10ea969 100644 --- a/epan/dissectors/packet-ansi_801.c +++ b/epan/dissectors/packet-ansi_801.c @@ -101,7 +101,6 @@ static int hf_ansi_801_offset_req = -1; static dissector_handle_t ansi_801_handle; static char bigbuf[1024]; -static dissector_handle_t data_handle; /* PARAM FUNCTIONS */ @@ -2399,6 +2398,4 @@ proto_reg_handoff_ansi_801(void) dissector_add_uint("ansi_map.pld", ANSI_801_REVERSE, ansi_801_handle); dissector_add_uint("ansi_a.pld", ANSI_801_FORWARD, ansi_801_handle); dissector_add_uint("ansi_a.pld", ANSI_801_REVERSE, ansi_801_handle); - - data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index ebff4e1d6d..5f141b72b2 100644 --- a/epan/dissectors/packet-asterix.c +++ b/epan/dissectors/packet-asterix.c @@ -1552,8 +1552,6 @@ static gint ett_065_SP = -1; static dissector_handle_t asterix_handle; -static dissector_handle_t data_handle = NULL; - #define FIXED 0x01 #define REPETITIVE 0x02 #define FX 0x04 @@ -6457,7 +6455,6 @@ void proto_register_asterix (void) void proto_reg_handoff_asterix (void) { - data_handle = find_dissector ("data"); dissector_add_uint ("udp.port", ASTERIX_PORT, asterix_handle); } diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index f9cf73d8d8..5349f527ba 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -4793,7 +4793,6 @@ static gint ett_bacapp_value = -1; static expert_field ei_bacapp_bad_length = EI_INIT; -static dissector_handle_t data_handle; static gint32 propertyIdentifier = -1; static gint32 propertyArrayIndex = -1; static guint32 object_type = 4096; @@ -11305,12 +11304,6 @@ proto_register_bacapp(void) bacapp_tap = register_tap("bacapp"); /* BACnet statistics tap */ } -void -proto_reg_handoff_bacapp(void) -{ - data_handle = find_dissector("data"); -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index f9b9316e7f..37e4595e8c 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -185,7 +185,6 @@ static gboolean bpdu_use_system_id_extensions = TRUE; static dissector_handle_t gvrp_handle; static dissector_handle_t gmrp_handle; -static dissector_handle_t data_handle; static const value_string protocol_id_vals[] = { { 0, "Spanning Tree Protocol" }, @@ -1471,7 +1470,6 @@ proto_reg_handoff_bpdu(void) * Get handle for the GMRP dissector. */ gmrp_handle = find_dissector("gmrp"); - data_handle = find_dissector("data"); bpdu_handle = find_dissector("bpdu"); dissector_add_uint("llc.dsap", SAP_BPDU, bpdu_handle); diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index 9bc0e5162f..a2aafad6a3 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.c @@ -104,7 +104,6 @@ static gint proto_brdwlk = -1; static guint16 packet_count = 0; static gboolean first_pkt = TRUE; /* start of capture */ -static dissector_handle_t data_handle; static dissector_handle_t fc_dissector_handle; @@ -366,9 +365,7 @@ dissect_brdwlk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } next_tvb = tvb_new_subset(tvb, 2, len, reported_len); - if (fc_dissector_handle) { - call_dissector(fc_dissector_handle, next_tvb, pinfo, tree); - } + call_dissector(fc_dissector_handle, next_tvb, pinfo, tree); } static void @@ -463,6 +460,5 @@ proto_reg_handoff_brdwlk(void) brdwlk_handle = create_dissector_handle(dissect_brdwlk, proto_brdwlk); dissector_add_uint("ethertype", ETHERTYPE_BRDWALK, brdwlk_handle); dissector_add_uint("ethertype", 0xABCD, brdwlk_handle); - data_handle = find_dissector("data"); fc_dissector_handle = find_dissector("fc"); } diff --git a/epan/dissectors/packet-cimetrics.c b/epan/dissectors/packet-cimetrics.c index 1f43d1762c..b6133cecaf 100644 --- a/epan/dissectors/packet-cimetrics.c +++ b/epan/dissectors/packet-cimetrics.c @@ -44,9 +44,6 @@ static const value_string cimetrics_pid_vals[] = { { 0, NULL } }; -static dissector_handle_t bacnet_handle; -static dissector_handle_t data_handle; - static int proto_cimetrics_mstp = -1; static int hf_llc_cimetrics_pid = -1; static gint ett_cimetrics_mstp = -1; @@ -134,6 +131,4 @@ proto_reg_handoff_cimetrics(void) mstp_handle = find_dissector("cimetrics"); dissector_add_uint("llc.cimetrics_pid", 1, mstp_handle); - bacnet_handle = find_dissector("bacnet"); - data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c index 95db78ba22..72a7238beb 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.c @@ -112,7 +112,6 @@ static gint ett_cpfi_header = -1; static gint ett_cpfi_footer = -1; static dissector_handle_t fc_handle; -static dissector_handle_t data_handle; static const value_string sof_type_vals[] = { @@ -536,7 +535,6 @@ proto_reg_handoff_cpfi(void) if ( !cpfi_init_complete ) { fc_handle = find_dissector("fc"); - data_handle = find_dissector("data"); cpfi_handle = new_create_dissector_handle(dissect_cpfi, proto_cpfi); ttot_handle = new_create_dissector_handle(dissect_cpfi, proto_cpfi); cpfi_init_complete = TRUE; diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c index 48faf1c122..3db1c210d8 100644 --- a/epan/dissectors/packet-erldp.c +++ b/epan/dissectors/packet-erldp.c @@ -173,9 +173,6 @@ static gboolean erldp_desegment = TRUE; /* Dissectors */ static dissector_handle_t erldp_handle = NULL; -/* Subdissectors */ -static dissector_handle_t data_handle; - /*--- External Term Format ---*/ static gint dissect_etf_type(const gchar *label, packet_info *pinfo, tvbuff_t *tvb, gint offset, proto_tree *tree); @@ -692,6 +689,4 @@ void proto_register_erldp(void) { void proto_reg_handoff_erldp(void) { dissector_add_handle("tcp.port", erldp_handle); - - data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-etv.c b/epan/dissectors/packet-etv.c index e47bb933a0..e155dbf29b 100644 --- a/epan/dissectors/packet-etv.c +++ b/epan/dissectors/packet-etv.c @@ -38,7 +38,6 @@ void proto_reg_handoff_etv(void); static int proto_etv_dii = -1; static int proto_etv_ddb = -1; -static dissector_handle_t data_handle; static dissector_handle_t dsmcc_handle; static int hf_etv_dii_filter_info = -1; @@ -243,6 +242,5 @@ proto_reg_handoff_etv(void) dissector_add_uint("mpeg_sect.tid", ETV_TID_DII_SECTION, etv_dii_handle); dissector_add_uint("mpeg_sect.tid", ETV_TID_DDB_SECTION, etv_ddb_handle); dsmcc_handle = find_dissector("mp2t-dsmcc"); - data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c index bee916a574..f92fa3c1f6 100644 --- a/epan/dissectors/packet-fcdns.c +++ b/epan/dissectors/packet-fcdns.c @@ -330,8 +330,6 @@ typedef struct _fcdns_conv_data { static GHashTable *fcdns_req_hash = NULL; -static dissector_handle_t data_handle; - /* * Hash Functions */ @@ -1955,6 +1953,4 @@ proto_reg_handoff_fcdns (void) { dissector_add_uint("fcct.server", FCCT_GSRVR_DNS, dns_handle); dissector_add_uint("fcct.server", FCCT_GSRVR_UNS, dns_handle); - - data_handle = find_dissector("data"); } diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c index 20bdf064de..8b9015d102 100644 --- a/epan/dissectors/packet-fcsp.c +++ b/epan/dissectors/packet-fcsp.c @@ -95,8 +95,6 @@ static int hf_auth_dhchap_rsp_value = -1; /* Initialize the subtree pointers */ static gint ett_fcsp = -1; -static dissector_handle_t data_handle; - static const value_string fcauth_msgcode_vals[] = { {FC_AUTH_MSG_AUTH_REJECT, "AUTH_Reject"}, {FC_AUTH_MSG_AUTH_NEGOTIATE, "AUTH_Negotiate"}, @@ -613,9 +611,3 @@ proto_register_fcsp(void) proto_register_subtree_array(ett, array_length(ett)); } -void -proto_reg_handoff_fcsp(void) -{ - data_handle = find_dissector("data"); -} - diff --git a/epan/dissectors/packet-gmr1_bcch.c b/epan/dissectors/packet-gmr1_bcch.c index 7c913c851e..10350be73c 100644 --- a/epan/dissectors/packet-gmr1_bcch.c +++ b/epan/dissectors/packet-gmr1_bcch.c @@ -44,10 +44,6 @@ static int proto_gmr1_bcch = -1; /* GMR-1 BCCH sub tree */ static gint ett_gmr1_bcch = -1; -/* Handoffs */ -static dissector_handle_t data_handle; - - /* ------------------------------------------------------------------------ */ /* CSN1 fields */ @@ -1430,12 +1426,6 @@ proto_register_gmr1_bcch(void) register_dissector("gmr1_bcch", dissect_gmr1_bcch, proto_gmr1_bcch); } -void -proto_reg_handoff_gmr1_bcch(void) -{ - data_handle = find_dissector("data"); -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * diff --git a/epan/dissectors/packet-gmr1_dtap.c b/epan/dissectors/packet-gmr1_dtap.c index c1377035ed..3893790644 100644 --- a/epan/dissectors/packet-gmr1_dtap.c +++ b/epan/dissectors/packet-gmr1_dtap.c @@ -46,7 +46,6 @@ static gint ett_gmr1_pd = -1; /* Handoffs */ static dissector_handle_t gsm_dtap_handle; -static dissector_handle_t data_handle; static void @@ -180,6 +179,5 @@ proto_reg_handoff_gmr1_dtap(void) dissector_add_uint("lapsat.sapi", 0 , dtap_handle); /* LAPSat: CC/RR/MM */ dissector_add_uint("lapsat.sapi", 3 , dtap_handle); /* LAPSat: SMS/SS */ - data_handle = find_dissector("data"); gsm_dtap_handle = find_dissector("gsm_a_dtap"); } diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 9685f964c9..a8f1c78bca 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -1680,7 +1680,6 @@ static dissector_handle_t ip_handle; static dissector_handle_t ipv6_handle; static dissector_handle_t ppp_handle; static dissector_handle_t sync_handle; -static dissector_handle_t data_handle; static dissector_handle_t gtpcdr_handle; static dissector_handle_t sndcpxid_handle; static dissector_handle_t gtpv2_handle; @@ -9401,7 +9400,6 @@ proto_reg_handoff_gtp(void) ipv6_handle = find_dissector("ipv6"); ppp_handle = find_dissector("ppp"); sync_handle = find_dissector("sync"); - data_handle = find_dissector("data"); gtpcdr_handle = find_dissector("gtpcdr"); sndcpxid_handle = find_dissector("sndcpxid"); gtpv2_handle = find_dissector("gtpv2"); diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c index 34e5f510ef..267b9dc1e8 100644 --- a/epan/dissectors/packet-hpteam.c +++ b/epan/dissectors/packet-hpteam.c @@ -35,9 +35,6 @@ static int proto_hpteam = -1; -/* Handle of the "data" subdissector */ -static dissector_handle_t data_handle; - /* Known HP NIC teaming PID values */ static const value_string hpteam_pid_vals[] = { { 0x0002, "HP Teaming heartbeat" }, @@ -138,7 +135,6 @@ void proto_reg_handoff_hpteam(void) { dissector_handle_t hpteam_handle; - data_handle = find_dissector("data"); hpteam_handle = find_dissector("hpteam"); /* Register dissector to key off of known PID / OUI combination */ dissector_add_uint("llc.hpteam_pid", 0x0002, hpteam_handle); diff --git a/epan/dissectors/packet-sbc.c b/epan/dissectors/packet-sbc.c index 6a46aac333..091d099f65 100644 --- a/epan/dissectors/packet-sbc.c +++ b/epan/dissectors/packet-sbc.c @@ -62,8 +62,6 @@ static gint ett_sbc_list = -1; static expert_field ei_sbc_syncword = EI_INIT; -static dissector_handle_t data_handle; - extern value_string_ext media_codec_audio_type_vals_ext; static const value_string sampling_frequency_vals[] = { @@ -333,12 +331,6 @@ proto_register_sbc(void) "Version of codec supported by this dissector."); } -void -proto_reg_handoff_sbc(void) -{ - data_handle = find_dissector("data"); -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * diff --git a/epan/dissectors/packet-sdh.c b/epan/dissectors/packet-sdh.c index 212e776d7d..4cbd6d5478 100644 --- a/epan/dissectors/packet-sdh.c +++ b/epan/dissectors/packet-sdh.c @@ -67,8 +67,6 @@ static int hf_sdh_h1 = -1; static int hf_sdh_h2 = -1; static int hf_sdh_j1 = -1; -static dissector_handle_t data_handle; - static gint sdh_data_rate = 1; static const enum_val_t data_rates[] = { @@ -287,8 +285,5 @@ proto_reg_handoff_sdh(void) sdh_handle = find_dissector("sdh"); dissector_add_uint("wtap_encap", WTAP_ENCAP_SDH, sdh_handle); - - data_handle = find_dissector("data"); - } |