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-evrc.c | |
| parent | 6012ba8f008bfba24fd44ce7a2a3055572453dce (diff) | |
| download | wireshark-bbdd89b973353a0df1d98d884c38f3832670bfea.tar.gz | |
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-evrc.c')
| -rw-r--r-- | epan/dissectors/packet-evrc.c | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c index fbe522ec96..977aa406a6 100644 --- a/epan/dissectors/packet-evrc.c +++ b/epan/dissectors/packet-evrc.c @@ -404,40 +404,46 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia } } -static void -dissect_evrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_evrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_evrc_aux(tvb, pinfo, tree, EVRC_VARIANT_EVRC); + return tvb_captured_length(tvb); } -static void -dissect_evrcb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_evrcb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_evrc_aux(tvb, pinfo, tree, EVRC_VARIANT_EVRC_B); + return tvb_captured_length(tvb); } -static void -dissect_evrcwb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_evrcwb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_evrc_aux(tvb, pinfo, tree, EVRC_VARIANT_EVRC_WB); + return tvb_captured_length(tvb); } -static void -dissect_evrcnw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_evrcnw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_evrc_aux(tvb, pinfo, tree, EVRC_VARIANT_EVRC_NW); + return tvb_captured_length(tvb); } -static void -dissect_evrcnw2k(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_evrcnw2k(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_evrc_aux(tvb, pinfo, tree, EVRC_VARIANT_EVRC_NW2k); + return tvb_captured_length(tvb); } -static void -dissect_evrc_legacy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_evrc_legacy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_evrc_aux(tvb, pinfo, tree, EVRC_VARIANT_EVRC_LEGACY); + return tvb_captured_length(tvb); } @@ -611,12 +617,12 @@ proto_reg_handoff_evrc(void) dissector_handle_t evrcnw_handle; dissector_handle_t evrcnw2k_handle; - evrc_handle = create_dissector_handle(dissect_evrc, proto_evrc); - evrcb_handle = create_dissector_handle(dissect_evrcb, proto_evrc); - evrcwb_handle = create_dissector_handle(dissect_evrcwb, proto_evrc); - evrcnw_handle = create_dissector_handle(dissect_evrcnw, proto_evrc); - evrcnw2k_handle = create_dissector_handle(dissect_evrcnw2k, proto_evrc); - evrc_legacy_handle = create_dissector_handle(dissect_evrc_legacy, proto_evrc); + evrc_handle = new_create_dissector_handle(dissect_evrc, proto_evrc); + evrcb_handle = new_create_dissector_handle(dissect_evrcb, proto_evrc); + evrcwb_handle = new_create_dissector_handle(dissect_evrcwb, proto_evrc); + evrcnw_handle = new_create_dissector_handle(dissect_evrcnw, proto_evrc); + evrcnw2k_handle = new_create_dissector_handle(dissect_evrcnw2k, proto_evrc); + evrc_legacy_handle = new_create_dissector_handle(dissect_evrc_legacy, proto_evrc); /* header-full mime types */ dissector_add_string("rtp_dyn_payload_type", "EVRC", evrc_handle); |