diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-03-19 20:33:14 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-20 17:38:03 +0000 |
| commit | 1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf (patch) | |
| tree | 4147c4f2bee3b93c250a49fa8ec337072c80e713 /epan/dissectors/packet-ipmi.c | |
| parent | 2b2fc64447e5f778d969e6c850e9196d248cbbe1 (diff) | |
Create call_data_dissector() to call data dissector.
This saves many dissectors the need to find the data dissector and store a handle to it.
There were also some that were finding it, but not using it.
For others this was the only reason for their handoff function, so it could be eliminated.
Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b
Reviewed-on: https://code.wireshark.org/review/14530
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ipmi.c')
| -rw-r--r-- | epan/dissectors/packet-ipmi.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index fc1822f6da..5991bfb08c 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -130,8 +130,6 @@ typedef struct { /* Maximum nest level where it worth caching data */ #define MAX_NEST_LEVEL 3 -static dissector_handle_t data_dissector; - gint proto_ipmi = -1; static gint proto_ipmb = -1; static gint proto_kcs = -1; @@ -472,7 +470,7 @@ dissect_ipmi_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (tvb_captured_length(tvb) < ctx->hdr_len + siglen + is_resp + !(ctx->flags & IPMI_D_NO_CKS)) { /* don bother with anything */ - return call_dissector(data_dissector, tvb, pinfo, tree); + return call_data_dissector(tvb, pinfo, tree); } /* save nest level */ @@ -1810,8 +1808,6 @@ proto_register_ipmi(void) register_dissector("kcs", dissect_kcs, proto_kcs); register_dissector("tmode", dissect_tmode, proto_tmode); - data_dissector = find_dissector("data"); - m = prefs_register_protocol(proto_ipmi, NULL); prefs_register_bool_preference(m, "fru_langcode_is_english", "FRU Language Code is English", "FRU Language Code is English; strings are ASCII+LATIN1 (vs. Unicode)", |