From 799d6fd057b0c20a7692a1181d811a8ff3a88d04 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 15 Nov 2015 16:51:45 -0500 Subject: create_dissector_handle -> new_create_dissector_handle Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I96aa9cf53533cbb07105aa400d42922baf3016b3 Reviewed-on: https://code.wireshark.org/review/11860 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-mpeg-pat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'epan/dissectors/packet-mpeg-pat.c') diff --git a/epan/dissectors/packet-mpeg-pat.c b/epan/dissectors/packet-mpeg-pat.c index a931ee1c1e..8e6ef0291a 100644 --- a/epan/dissectors/packet-mpeg-pat.c +++ b/epan/dissectors/packet-mpeg-pat.c @@ -58,10 +58,9 @@ static const true_false_string mpeg_pat_cur_next_vals = { }; -static void -dissect_mpeg_pat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_mpeg_pat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0, length = 0; guint16 prog_num, prog_pid; @@ -94,7 +93,7 @@ dissect_mpeg_pat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; if (offset >= length) - return; + return offset; /* Parse all the programs */ @@ -117,6 +116,7 @@ dissect_mpeg_pat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += packet_mpeg_sect_crc(tvb, pinfo, mpeg_pat_tree, 0, offset); proto_item_set_len(ti, offset); + return tvb_captured_length(tvb); } @@ -190,7 +190,7 @@ void proto_reg_handoff_mpeg_pat(void) { dissector_handle_t mpeg_pat_handle; - mpeg_pat_handle = create_dissector_handle(dissect_mpeg_pat, proto_mpeg_pat); + mpeg_pat_handle = new_create_dissector_handle(dissect_mpeg_pat, proto_mpeg_pat); dissector_add_uint("mpeg_sect.tid", MPEG_PAT_TID, mpeg_pat_handle); } -- cgit v1.2.3