From 007813964c4564970fad1fecf00a01d68505e671 Mon Sep 17 00:00:00 2001 From: wmeier Date: Thu, 11 Sep 2008 14:07:02 +0000 Subject: Minor cleanup related to proto_reg_handoff .... git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26176 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-actrace.c | 2 +- epan/dissectors/packet-beep.c | 9 ++++----- epan/dissectors/packet-dmp.c | 4 ++-- epan/dissectors/packet-dtpt.c | 2 +- epan/dissectors/packet-etheric.c | 7 +++---- epan/dissectors/packet-gtp.c | 2 +- epan/dissectors/packet-llt.c | 2 +- epan/dissectors/packet-quake2.c | 2 +- epan/dissectors/packet-quakeworld.c | 2 +- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c index bfed0a25d7..b92259dfff 100644 --- a/epan/dissectors/packet-actrace.c +++ b/epan/dissectors/packet-actrace.c @@ -803,7 +803,7 @@ void proto_reg_handoff_actrace(void) { static gboolean actrace_prefs_initialized = FALSE; static dissector_handle_t actrace_handle; - static guint actrace_udp_port = 0; + static guint actrace_udp_port; if (!actrace_prefs_initialized) { diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index 477b7a1f05..0fedc6634b 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -96,8 +96,6 @@ static int ett_mime_header = -1; static int ett_header = -1; static int ett_trailer = -1; -static guint tcp_port = 0; - /* Get the state of the more flag ... */ #define BEEP_VIOL 0 @@ -486,7 +484,7 @@ set_mime_hdr_flags(int more, struct beep_request_val *request_val, if (!request_val) return; /* Nothing to do ??? */ - if (pinfo->destport == tcp_port) { /* Going to the server ... client */ + if (pinfo->destport == global_beep_tcp_port) { /* Going to the server ... client */ if (request_val->c_mime_hdr) { @@ -1094,6 +1092,7 @@ proto_reg_handoff_beep(void) { static gboolean beep_prefs_initialized = FALSE; static dissector_handle_t beep_handle; + static guint beep_tcp_port; if (!beep_prefs_initialized) { @@ -1104,13 +1103,13 @@ proto_reg_handoff_beep(void) } else { - dissector_delete("tcp.port", tcp_port, beep_handle); + dissector_delete("tcp.port", beep_tcp_port, beep_handle); } /* Set our port number for future use */ - tcp_port = global_beep_tcp_port; + beep_tcp_port = global_beep_tcp_port; dissector_add("tcp.port", global_beep_tcp_port, beep_handle); diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index ec06fabc0c..4683070b45 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -409,7 +409,7 @@ static gint ett_checksum = -1; static gint ett_analysis = -1; -static dissector_handle_t dmp_handle = NULL; +static dissector_handle_t dmp_handle; typedef struct _dmp_id_key { guint id; @@ -4414,7 +4414,7 @@ static void range_add_callback (guint32 port) void proto_reg_handoff_dmp (void) { - static int dmp_prefs_initialized = FALSE; + static gboolean dmp_prefs_initialized = FALSE; if (!dmp_prefs_initialized) { dmp_handle = create_dissector_handle (dissect_dmp, proto_dmp); diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index a71c9e187f..cf6255e0b9 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -846,7 +846,7 @@ proto_reg_handoff_dtpt(void) { static dissector_handle_t dtpt_handle; static gboolean Initialized=FALSE; - static int ServerPort=0; + static int ServerPort; if (!Initialized) { dtpt_handle = new_create_dissector_handle(dissect_dtpt, proto_dtpt); diff --git a/epan/dissectors/packet-etheric.c b/epan/dissectors/packet-etheric.c index b91bae727f..6d98cf09db 100644 --- a/epan/dissectors/packet-etheric.c +++ b/epan/dissectors/packet-etheric.c @@ -99,7 +99,7 @@ static gint ett_etheric_circuit_state_ind = -1; static guint ethericTCPport1 =1806; static guint ethericTCPport2 =10002; -static dissector_handle_t q931_ie_handle = NULL; +static dissector_handle_t q931_ie_handle; /* Value strings */ static const value_string protocol_version_vals[] = { { 0x00, "Etheric 1.0" }, @@ -1006,9 +1006,8 @@ void proto_reg_handoff_etheric(void) { static dissector_handle_t etheric_handle; - - static int tcp_port1 = 1806; - static int tcp_port2 = 10002; + static int tcp_port1; + static int tcp_port2; static gboolean Initialized=FALSE; if (!Initialized) { diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 7dadd71d6d..f9e5fd7eee 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -1391,7 +1391,7 @@ static dissector_handle_t ppp_handle; static dissector_handle_t data_handle; static dissector_handle_t gtpcdr_handle; static dissector_handle_t sndcpxid_handle; -static dissector_table_t bssap_pdu_type_table=NULL; +static dissector_table_t bssap_pdu_type_table; static int decode_gtp_cause (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); static int decode_gtp_imsi (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree); diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c index 3b33f7547b..65eebdf655 100644 --- a/epan/dissectors/packet-llt.c +++ b/epan/dissectors/packet-llt.c @@ -150,7 +150,7 @@ proto_reg_handoff_llt(void) { static gboolean initialized = FALSE; static dissector_handle_t llt_handle; - static guint preference_alternate_ethertype_last = 0x0; + static guint preference_alternate_ethertype_last; if (!initialized) { llt_handle = create_dissector_handle(dissect_llt, proto_llt); diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c index 4f21383e25..b8cdafb6dc 100644 --- a/epan/dissectors/packet-quake2.c +++ b/epan/dissectors/packet-quake2.c @@ -766,7 +766,7 @@ proto_reg_handoff_quake2(void) { static gboolean Initialized=FALSE; static dissector_handle_t quake2_handle; - static int ServerPort=0; + static int ServerPort; if (!Initialized) { quake2_handle = create_dissector_handle(dissect_quake2, diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c index 1feb93fac5..d1cc2a0916 100644 --- a/epan/dissectors/packet-quakeworld.c +++ b/epan/dissectors/packet-quakeworld.c @@ -773,7 +773,7 @@ proto_reg_handoff_quakeworld(void) { static gboolean Initialized=FALSE; static dissector_handle_t quakeworld_handle; - static int ServerPort=0; + static int ServerPort; if (!Initialized) { quakeworld_handle = create_dissector_handle(dissect_quakeworld, -- cgit v1.2.3