diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-11-04 22:01:35 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-11-04 22:01:35 +0000 |
| commit | 017f36d61bd8f72f3eb06f962245385dc0a5ed38 (patch) | |
| tree | 285f9e57641612fd7549f040ef082a42a7c34c26 /asn1/ranap | |
| parent | 92a9b695a49890ba962794753669551a2871ac3f (diff) | |
| download | wireshark-017f36d61bd8f72f3eb06f962245385dc0a5ed38.tar.gz | |
Minor cleanup mostly related to proto_reg_handoff
Remove code for unused handles;
Localize handles to proto_reg_handoff as appropriate;
Localize "saved_prefs" to proto_reg_handoff;
In some cases: move "once-only" code in proto_reg_handoff
so that it's executed only the first time thru
proto_reg_handoff;
Properly delete/add port when pref changed (packet_ulp);
svn path=/trunk/; revision=26697
Diffstat (limited to 'asn1/ranap')
| -rw-r--r-- | asn1/ranap/packet-ranap-template.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index df56e28ace..657ba60b6b 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -60,8 +60,6 @@ #include "packet-ranap-val.h" -static dissector_handle_t ranap_handle = NULL; - /* Initialize the protocol and registered fields */ static int proto_ranap = -1; @@ -237,7 +235,6 @@ void proto_register_ranap(void) { /* Register dissector */ register_dissector("ranap", dissect_ranap, proto_ranap); - ranap_handle = find_dissector("ranap"); /* Register dissector tables */ ranap_ies_dissector_table = register_dissector_table("ranap.ies", "RANAP-PROTOCOL-IES", FT_UINT32, BASE_DEC); @@ -262,11 +259,14 @@ void proto_register_ranap(void) { void proto_reg_handoff_ranap(void) { - static int initialized = FALSE; + static gboolean initialized = FALSE; + static dissector_handle_t ranap_handle; static gint local_ranap_sccp_ssn; if (!initialized) { + ranap_handle = find_dissector("ranap"); initialized = TRUE; +#include "packet-ranap-dis-tab.c" } else { dissector_delete("sccp.ssn", local_ranap_sccp_ssn, ranap_handle); } @@ -274,7 +274,6 @@ proto_reg_handoff_ranap(void) dissector_add("sccp.ssn", global_ranap_sccp_ssn, ranap_handle); local_ranap_sccp_ssn = global_ranap_sccp_ssn; -#include "packet-ranap-dis-tab.c" } |