diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-09 23:01:28 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-13 17:44:24 +0000 |
| commit | 01f7356f85d33567a25e722e6488addd72ff64d4 (patch) | |
| tree | 2d8623b57706cc924f76293f0f5b6ce8d83124ab /epan/dissectors/packet-dmx-chan.c | |
| parent | b776707af540d7431e815818e21ea1efac326d9f (diff) | |
register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I3d5e576b796556ef070bb36d8b55da0b175dcba8
Reviewed-on: https://code.wireshark.org/review/11805
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-dmx-chan.c')
| -rw-r--r-- | epan/dissectors/packet-dmx-chan.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dmx-chan.c b/epan/dissectors/packet-dmx-chan.c index dab05239c9..3fc8b0f94d 100644 --- a/epan/dissectors/packet-dmx-chan.c +++ b/epan/dissectors/packet-dmx-chan.c @@ -55,8 +55,8 @@ static gint global_disp_chan_val_type = 0; static gint global_disp_col_count = 16; static gint global_disp_chan_nr_type = 0; -static void -dissect_dmx_chan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_dmx_chan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "DMX Channels"); col_clear(pinfo->cinfo, COL_INFO); @@ -114,6 +114,7 @@ dissect_dmx_chan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset, length, ENC_NA ); PROTO_ITEM_SET_HIDDEN(item); } + return tvb_captured_length(tvb); } void @@ -164,7 +165,7 @@ proto_register_dmx_chan(void) proto_dmx_chan = proto_register_protocol("DMX Channels","DMX Channels", "dmx-chan"); proto_register_field_array(proto_dmx_chan, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("dmx-chan", dissect_dmx_chan, proto_dmx_chan); + new_register_dissector("dmx-chan", dissect_dmx_chan, proto_dmx_chan); dmx_chan_module = prefs_register_protocol(proto_dmx_chan, NULL); |