diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-12-07 20:34:08 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-12-07 20:34:08 +0000 |
commit | caa164ca535f7e55b4a0b5d843c60803b5fefed0 (patch) | |
tree | a537d4342ed0c265a415292c1dfa69812c33a1c2 | |
parent | c7d6d645c699cf0d73d0fc4f171356160f05d652 (diff) |
As ponted out by Stig Bjørlykke change a whole bunch of dissector_handle_t to static.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20062 f5534014-38df-0310-8fa8-9805f1628bb7
28 files changed, 40 insertions, 40 deletions
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c index 9462e39bde..ee651bc323 100644 --- a/asn1/ansi_map/packet-ansi_map-template.c +++ b/asn1/ansi_map/packet-ansi_map-template.c @@ -116,7 +116,7 @@ static range_t *global_ssn_range; static range_t *ssn_range; -dissector_handle_t ansi_map_handle=NULL; +static dissector_handle_t ansi_map_handle=NULL; /* Initialize the protocol and registered fields */ static int ansi_map_tap = -1; diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c index d77a9f6102..79adafda3b 100644 --- a/asn1/camel/packet-camel-template.c +++ b/asn1/camel/packet-camel-template.c @@ -134,7 +134,7 @@ static gint ett_camel_stat = -1; #define MAX_SSN 254 static range_t *global_ssn_range; static range_t *ssn_range; -dissector_handle_t camel_handle; +static dissector_handle_t camel_handle; /* Global variables */ diff --git a/asn1/gsmmap/gsm_map-exp.cnf b/asn1/gsmmap/gsm_map-exp.cnf index c0a61e1d29..4b60d2b3cc 100644 --- a/asn1/gsmmap/gsm_map-exp.cnf +++ b/asn1/gsmmap/gsm_map-exp.cnf @@ -1,6 +1,6 @@ # Do not modify this file. # It is created automatically by the ASN.1 to Wireshark dissector compiler -# .\gsm_map-exp.cnf +# ./gsm_map-exp.cnf # ../../tools/asn2wrs.py -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn #.MODULE diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c index 0f89e7fdf7..68f6417be3 100644 --- a/asn1/gsmmap/packet-gsm_map-template.c +++ b/asn1/gsmmap/packet-gsm_map-template.c @@ -156,15 +156,15 @@ static gint ett_gsm_map_RadioResourceInformation =-1; #include "packet-gsm_map-ett.c" static dissector_table_t sms_dissector_table; /* SMS TPDU */ -static dissector_handle_t data_handle; -static dissector_handle_t ranap_handle; +static dissector_handle_t data_handle; +static dissector_handle_t ranap_handle; +static dissector_handle_t map_handle; /* Preferenc settings default */ gboolean old_gsm_map_version = FALSE; #define MAX_SSN 254 static range_t *global_ssn_range; static range_t *ssn_range; -dissector_handle_t map_handle; /* Global variables */ static guint32 opcode=0; diff --git a/asn1/inap/packet-inap-template.c b/asn1/inap/packet-inap-template.c index 6cb197bf4c..26f3e7c4a0 100644 --- a/asn1/inap/packet-inap-template.c +++ b/asn1/inap/packet-inap-template.c @@ -68,7 +68,7 @@ static int hf_inap_genproblem = -1; static range_t *global_ssn_range; static range_t *ssn_range; -dissector_handle_t inap_handle; +static dissector_handle_t inap_handle; /* Initialize the subtree pointers */ static gint ett_inap = -1; diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c index a1f272d032..77d34cf547 100644 --- a/asn1/tcap/packet-tcap-template.c +++ b/asn1/tcap/packet-tcap-template.c @@ -85,7 +85,7 @@ extern gboolean gtcap_DisplaySRT; extern guint gtcap_RepetitionTimeout; extern guint gtcap_LostTimeout; -dissector_handle_t tcap_handle = NULL; +static dissector_handle_t tcap_handle = NULL; static dissector_table_t ber_oid_dissector_table=NULL; static const char * cur_oid; static const char * tcapext_oid; @@ -131,7 +131,7 @@ static dissector_handle_t get_ansi_tcap_subdissector(guint32 ssn) { return g_hash_table_lookup(ansi_sub_dissectors,GUINT_TO_POINTER(ssn)); } -dissector_handle_t get_itu_tcap_subdissector(guint32 ssn) { +static dissector_handle_t get_itu_tcap_subdissector(guint32 ssn) { return g_hash_table_lookup(itu_sub_dissectors,GUINT_TO_POINTER(ssn)); } diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 67a1da6a98..b739f72980 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -125,7 +125,7 @@ #define MAX_SSN 254 static range_t *global_ssn_range; static range_t *ssn_range; -dissector_handle_t ansi_map_handle; +static dissector_handle_t ansi_map_handle; /* PROTOTYPES/FORWARDS */ diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index dc8517227a..221ef8fa53 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -54,7 +54,7 @@ static int hf_btacl_reassembled_in = -1; /* Initialize the subtree pointers */ static gint ett_btacl = -1; -dissector_handle_t btl2cap_handle=NULL; +static dissector_handle_t btl2cap_handle=NULL; static gboolean acl_reassembly = TRUE; diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index acc86132ad..1b362edcc2 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -771,7 +771,7 @@ static gint ett_camel_CancelFailedPARAM = -1; #define MAX_SSN 254 static range_t *global_ssn_range; static range_t *ssn_range; -dissector_handle_t camel_handle; +static dissector_handle_t camel_handle; /* Global variables */ diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index ecfcd0a4ab..725e83ff21 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -129,7 +129,7 @@ static gint cigi3_add_image_generator_message(tvbuff_t*, proto_tree*, gint); static gfloat tvb_get_fixed_point(tvbuff_t*, int, gint); /* CIGI Handle */ -dissector_handle_t cigi_handle; +static dissector_handle_t cigi_handle; /* Initialize the protocol and registered fields */ static int proto_cigi = -1; diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 30bfccdac7..5e7cc94948 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* .\packet-gsm_map.c */ +/* ./packet-gsm_map.c */ /* ../../tools/asn2wrs.py -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ /* Input file: packet-gsm_map-template.c */ @@ -1389,15 +1389,15 @@ static gint ett_gsm_map_AccessTypePriv = -1; #line 157 "packet-gsm_map-template.c" static dissector_table_t sms_dissector_table; /* SMS TPDU */ -static dissector_handle_t data_handle; -static dissector_handle_t ranap_handle; +static dissector_handle_t data_handle; +static dissector_handle_t ranap_handle; +static dissector_handle_t map_handle; /* Preferenc settings default */ gboolean old_gsm_map_version = FALSE; #define MAX_SSN 254 static range_t *global_ssn_range; static range_t *ssn_range; -dissector_handle_t map_handle; /* Global variables */ static guint32 opcode=0; diff --git a/epan/dissectors/packet-gsm_map.h b/epan/dissectors/packet-gsm_map.h index aa3a6306ea..4e518f95ef 100644 --- a/epan/dissectors/packet-gsm_map.h +++ b/epan/dissectors/packet-gsm_map.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* .\packet-gsm_map.h */ +/* ./packet-gsm_map.h */ /* ../../tools/asn2wrs.py -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */ /* Input file: packet-gsm_map-template.h */ diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index da34597331..dae7b5db7f 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* .\packet-inap.c */ +/* ./packet-inap.c */ /* ../../tools/asn2wrs.py -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */ /* Input file: packet-inap-template.c */ @@ -355,7 +355,7 @@ static int hf_inap_rep = -1; /* ReturnErrorProblem */ static range_t *global_ssn_range; static range_t *ssn_range; -dissector_handle_t inap_handle; +static dissector_handle_t inap_handle; /* Initialize the subtree pointers */ static gint ett_inap = -1; diff --git a/epan/dissectors/packet-inap.h b/epan/dissectors/packet-inap.h index b520d2da30..1140154dfc 100644 --- a/epan/dissectors/packet-inap.h +++ b/epan/dissectors/packet-inap.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* .\packet-inap.h */ +/* ./packet-inap.h */ /* ../../tools/asn2wrs.py -b -e -p inap -c inap.cnf -s packet-inap-template inap.asn */ /* Input file: packet-inap-template.h */ diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 8e6f48a57d..ecf3315387 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -101,7 +101,7 @@ static gint ett_isakmp = -1; static gint ett_isakmp_flags = -1; static gint ett_isakmp_payload = -1; -dissector_handle_t eap_handle = NULL; +static dissector_handle_t eap_handle = NULL; /* IKE port number assigned by IANA */ #define UDP_PORT_ISAKMP 500 diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index 632979a5d0..46ec72a9d7 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -65,8 +65,8 @@ #define ISNS_SCN_PORT 2 -dissector_handle_t isns_tcp_handle; -dissector_handle_t isns_udp_handle; +static dissector_handle_t isns_tcp_handle; +static dissector_handle_t isns_udp_handle; static gint ett_isns_flags = -1; static gint ett_isns_payload = -1; diff --git a/epan/dissectors/packet-isup_thin.c b/epan/dissectors/packet-isup_thin.c index 7e81fc1d42..02a570b38f 100644 --- a/epan/dissectors/packet-isup_thin.c +++ b/epan/dissectors/packet-isup_thin.c @@ -91,8 +91,8 @@ static const value_string isup_thin_mtp_message_name_code_vals[] = { { 0, NULL } }; -dissector_handle_t isup_thin_handle; -dissector_handle_t isup_handle; +static dissector_handle_t isup_thin_handle; +static dissector_handle_t isup_handle; static int dissect_isup_thin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 76107dbd49..db30fe0e32 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -327,7 +327,7 @@ static gint ett_krb_e_checksum = -1; guint32 krb5_errorcode; -dissector_handle_t krb4_handle=NULL; +static dissector_handle_t krb4_handle=NULL; static gboolean do_col_info; diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c index 9d11ecaa85..a23c2c8818 100644 --- a/epan/dissectors/packet-llt.c +++ b/epan/dissectors/packet-llt.c @@ -63,7 +63,7 @@ static int hf_llt_message_time = -1; /* Initialize the subtree pointers */ static gint ett_llt = -1; -dissector_handle_t llt_handle; /* Declaring this here allows us to use it for re-registration throughout the handoff function */ +static dissector_handle_t llt_handle; /* Declaring this here allows us to use it for re-registration throughout the handoff function */ /* Code to actually dissect the packets */ static void diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 8967b1425e..88a8f19636 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -136,7 +136,7 @@ static gint hf_header_array[] = { #define MSRP_AUTHORIZATION 14 #define MSRP_AUTHENTICATION_INFO 15 -dissector_handle_t msrp_handle; +static dissector_handle_t msrp_handle; gboolean global_msrp_raw_text = TRUE; /* MSRP content type and internet media type used by other dissectors diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 2c860dbb39..397ae30b25 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -109,7 +109,7 @@ struct ncp_common_header *ncp_hdr; /* Tables for reassembly of fragments. */ GHashTable *nds_fragment_table = NULL; GHashTable *nds_reassembled_table = NULL; -dissector_handle_t nds_data_handle; +static dissector_handle_t nds_data_handle; /* desegmentation of NCP over TCP */ static gboolean ncp_desegment = TRUE; diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 2d8297dbbc..b8610baf38 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -127,8 +127,8 @@ radius_vendor_info_t no_vendor = {"Unknown Vendor",0,NULL,-1}; radius_attr_info_t no_dictionary_entry = {"Unknown-Attribute",0,FALSE,FALSE,radius_octets, NULL, NULL, -1, -1, -1, -1, -1 }; -dissector_handle_t eap_handle; -dissector_handle_t radius_handle; +static dissector_handle_t eap_handle; +static dissector_handle_t radius_handle; static const gchar* shared_secret = ""; static gboolean show_length = FALSE; diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index a9460f7dcd..41c49b91d0 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -77,7 +77,7 @@ static int hf_rsync_data = -1; static gint ett_rsync = -1; -dissector_handle_t rsync_handle; +static dissector_handle_t rsync_handle; #define TCP_PORT_RSYNC 873 diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 0e626ce39e..923fa17443 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* .\packet-tcap.c */ +/* ./packet-tcap.c */ /* ../../tools/asn2wrs.py -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */ /* Input file: packet-tcap-template.c */ @@ -276,7 +276,7 @@ extern gboolean gtcap_DisplaySRT; extern guint gtcap_RepetitionTimeout; extern guint gtcap_LostTimeout; -dissector_handle_t tcap_handle = NULL; +static dissector_handle_t tcap_handle = NULL; static dissector_table_t ber_oid_dissector_table=NULL; static const char * cur_oid; static const char * tcapext_oid; @@ -322,7 +322,7 @@ static dissector_handle_t get_ansi_tcap_subdissector(guint32 ssn) { return g_hash_table_lookup(ansi_sub_dissectors,GUINT_TO_POINTER(ssn)); } -dissector_handle_t get_itu_tcap_subdissector(guint32 ssn) { +static dissector_handle_t get_itu_tcap_subdissector(guint32 ssn) { return g_hash_table_lookup(itu_sub_dissectors,GUINT_TO_POINTER(ssn)); } diff --git a/epan/dissectors/packet-tcap.h b/epan/dissectors/packet-tcap.h index 78ef7036ce..ea96ef4cd2 100644 --- a/epan/dissectors/packet-tcap.h +++ b/epan/dissectors/packet-tcap.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Wireshark dissector compiler */ -/* .\packet-tcap.h */ +/* ./packet-tcap.h */ /* ../../tools/asn2wrs.py -b -e -p tcap -c tcap.cnf -s packet-tcap-template tcap.asn */ /* Input file: packet-tcap-template.h */ diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 5f3dedd2d9..2c93a99097 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -169,7 +169,7 @@ static gboolean extra_ethertype = FALSE; #define ETHERTYPE_TIPC2 0x0807 -dissector_handle_t ip_handle; +static dissector_handle_t ip_handle; static proto_tree *top_tree; diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c index 53baaa39b3..fe39715e5a 100644 --- a/epan/dissectors/packet-wfleet-hdlc.c +++ b/epan/dissectors/packet-wfleet-hdlc.c @@ -40,7 +40,7 @@ static int hf_wfleet_hdlc_cmd = -1; static gint ett_wfleet_hdlc = -1; -dissector_handle_t eth_withoutfcs_handle; +static dissector_handle_t eth_withoutfcs_handle; static const value_string wfleet_hdlc_cmd_vals[] = { { 0x03, "Un-numbered I frame"}, diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index 2cac0b1379..67a200acf5 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -107,7 +107,7 @@ static gint ett_winsrepl_send_reply = -1; static gint ett_winsrepl_flags = -1; -dissector_handle_t winsrepl_handle; +static dissector_handle_t winsrepl_handle; #define WINS_REPLICATION_PORT ( 42 ) #define WREPL_OPCODE_BITS ( 0x7800 ) |