diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-15 08:00:10 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 03:50:05 +0000 |
| commit | bbdd89b973353a0df1d98d884c38f3832670bfea (patch) | |
| tree | 9b992f923f565af2fcab30902508a191de85ca53 /epan/dissectors/packet-dvb-eit.c | |
| parent | 6012ba8f008bfba24fd44ce7a2a3055572453dce (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: Ie514f126352e7598acc4f7c38db9c61d105d5e48
Reviewed-on: https://code.wireshark.org/review/11850
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-dvb-eit.c')
| -rw-r--r-- | epan/dissectors/packet-dvb-eit.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dvb-eit.c b/epan/dissectors/packet-dvb-eit.c index 362fa0f118..48a8bb1fe4 100644 --- a/epan/dissectors/packet-dvb-eit.c +++ b/epan/dissectors/packet-dvb-eit.c @@ -87,8 +87,8 @@ static const value_string dvb_eit_free_ca_mode_vals[] = { { 0, NULL } }; -static void -dissect_dvb_eit(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_dvb_eit(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint offset = 0, length = 0; @@ -139,7 +139,7 @@ dissect_dvb_eit(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (offset >= length) { packet_mpeg_sect_crc(tvb, pinfo, dvb_eit_tree, 0, offset); - return; + return offset; } /* Parse all the events */ @@ -184,6 +184,7 @@ dissect_dvb_eit(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += packet_mpeg_sect_crc(tvb, pinfo, dvb_eit_tree, 0, offset); proto_item_set_len(ti, offset); + return tvb_captured_length(tvb); } @@ -292,7 +293,7 @@ void proto_reg_handoff_dvb_eit(void) int tid; dissector_handle_t dvb_eit_handle; - dvb_eit_handle = create_dissector_handle(dissect_dvb_eit, proto_dvb_eit); + dvb_eit_handle = new_create_dissector_handle(dissect_dvb_eit, proto_dvb_eit); for (tid = DVB_EIT_TID_MIN; tid <= DVB_EIT_TID_MAX; tid++) dissector_add_uint("mpeg_sect.tid", tid, dvb_eit_handle); |