diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-08-25 18:37:18 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-08-25 18:37:18 +0000 |
| commit | acbbc43f2ef44db31f6695bb04030bc4a6ebfd5b (patch) | |
| tree | a4009d33753fc890e54c58bb63242ebaf824d236 | |
| parent | 1b85a4b1e9a38b7d4feefb2d877c89a13dd31110 (diff) | |
Remove unnecessary registration of a prefs callback & do minor cleanup
svn path=/trunk/; revision=26078
| -rw-r--r-- | epan/dissectors/packet-bssgp.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-exec.c | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 5fe3559d59..548dc6b111 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -58,13 +58,11 @@ static int bssgp_decode_nri = 0; static guint bssgp_nri_length = 4; -static dissector_handle_t bssgp_handle; static dissector_handle_t llc_handle; static dissector_handle_t rrlp_handle; static dissector_handle_t data_handle; module_t *bssgp_module; -void proto_reg_handoff_bssgp(void); /* Initialize the protocol and registered fields */ static int hf_bssgp_iei_nacc_cause = -1; @@ -6202,7 +6200,7 @@ proto_register_bssgp(void) register_dissector("bssgp", dissect_bssgp, proto_bssgp); /* Register configuration options */ - bssgp_module = prefs_register_protocol(proto_bssgp, proto_reg_handoff_bssgp); + bssgp_module = prefs_register_protocol(proto_bssgp, NULL); prefs_register_bool_preference(bssgp_module, "decode_nri", "Decode NRI", "Decode NRI (for use with SGSN in Pool)", @@ -6217,7 +6215,6 @@ proto_register_bssgp(void) void proto_reg_handoff_bssgp(void) { - bssgp_handle = create_dissector_handle(dissect_bssgp, proto_bssgp); llc_handle = find_dissector("llcgprs"); rrlp_handle = find_dissector("rrlp"); data_handle = find_dissector("data"); diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c index b912e51cba..a2b84a874b 100644 --- a/epan/dissectors/packet-exec.c +++ b/epan/dissectors/packet-exec.c @@ -45,7 +45,6 @@ #define EXEC_PORT 512 /* Forward declaration we need below */ -void proto_reg_handoff_exec(void); static gboolean exec_isprint_string(guchar *string); static gboolean exec_isdigit_string(guchar *string); @@ -401,7 +400,7 @@ proto_register_exec(void) proto_register_subtree_array(ett, array_length(ett)); /* Register preferences module */ - exec_module = prefs_register_protocol(proto_exec, proto_reg_handoff_exec); + exec_module = prefs_register_protocol(proto_exec, NULL); /* Register our preferences */ prefs_register_bool_preference(exec_module, "info_show_username", |