diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-14 09:23:33 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-14 21:54:27 +0000 |
| commit | 28ea58251c04562cc0670e57bf073dc6966e73e6 (patch) | |
| tree | abe57292f17b280056a73ee7cfdc94abdcaaaaf3 /epan/dissectors/packet-q2931.c | |
| parent | 13101020e12eb21e8464a3c4eb4fc2fe51409235 (diff) | |
register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most.
This concludes a "first pass" over the dissector directory.
Change-Id: If5ce5484214be50fe541cba478da1de62e354297
Reviewed-on: https://code.wireshark.org/review/11830
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-q2931.c')
| -rw-r--r-- | epan/dissectors/packet-q2931.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c index d6e479a6a6..7dd1c020e6 100644 --- a/epan/dissectors/packet-q2931.c +++ b/epan/dissectors/packet-q2931.c @@ -1866,8 +1866,8 @@ dissect_q2931_ie(tvbuff_t *tvb, packet_info* pinfo, int offset, int len, proto_t } } -static void -dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { int offset = 0; proto_tree *q2931_tree = NULL; @@ -1952,7 +1952,7 @@ dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_q2931_ie(tvb, pinfo, offset, info_element_len, q2931_tree, info_element, info_element_ext); } -#if 0 /* XXX: Is codeset & etc supoosed to be used somehow ? */ +#if 0 /* XXX: Is codeset & etc supposed to be used somehow ? */ if (non_locking_shift) codeset = 0; /* @@ -1977,6 +1977,7 @@ dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) #endif offset += 1 + 1 + 2 + info_element_len; } + return tvb_captured_length(tvb); } void @@ -2561,7 +2562,7 @@ proto_register_q2931(void) expert_q2931 = expert_register_protocol(proto_q2931); expert_register_field_array(expert_q2931, ei, array_length(ei)); - register_dissector("q2931", dissect_q2931, proto_q2931); + new_register_dissector("q2931", dissect_q2931, proto_q2931); } /* |