diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-13 20:18:34 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-14 18:00:00 +0000 |
| commit | 8faf5c80b3302247c32e1f5c492cb31a082ee0ad (patch) | |
| tree | e9bac5673fc9a480fe1fa06fcc6d5d7d45b37389 /epan/dissectors/packet-gmr1_rr.c | |
| parent | 76dec3ba681da2c315efba4433d3b1f995defd91 (diff) | |
| download | wireshark-8faf5c80b3302247c32e1f5c492cb31a082ee0ad.tar.gz | |
register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I25fe6a0aac93980333217d007702799d16946563
Reviewed-on: https://code.wireshark.org/review/11816
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-gmr1_rr.c')
| -rw-r--r-- | epan/dissectors/packet-gmr1_rr.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c index 7bf290cf06..bc07eb95d4 100644 --- a/epan/dissectors/packet-gmr1_rr.c +++ b/epan/dissectors/packet-gmr1_rr.c @@ -1786,8 +1786,8 @@ gmr1_get_msg_rr_params(guint8 oct, int dcch, const gchar **msg_str, /* Dissector code */ /* ------------------------------------------------------------------------ */ -static void -dissect_gmr1_ccch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_gmr1_ccch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint32 len, offset; gmr1_msg_func_t msg_func; @@ -1895,12 +1895,10 @@ dissect_gmr1_ccch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ccch_tree, hf_rr_message_elements, tvb, offset, len - offset, ENC_NA); } - /* Done ! */ - return; - /* Error handling */ err: call_dissector(data_handle, tvb, pinfo, tree); + return tvb_captured_length(tvb); } void @@ -2458,7 +2456,7 @@ proto_register_gmr1_rr(void) proto_gmr1_ccch = proto_register_protocol("GEO-Mobile Radio (1) CCCH", "GMR-1 CCCH", "gmr1.ccch"); /* Register dissector */ - register_dissector("gmr1_ccch", dissect_gmr1_ccch, proto_gmr1_ccch); + new_register_dissector("gmr1_ccch", dissect_gmr1_ccch, proto_gmr1_ccch); } void |