From 01f7356f85d33567a25e722e6488addd72ff64d4 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Mon, 9 Nov 2015 23:01:28 -0500 Subject: register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I3d5e576b796556ef070bb36d8b55da0b175dcba8 Reviewed-on: https://code.wireshark.org/review/11805 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-ecp-oui.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-ecp-oui.c') diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c index 14fd8ae8a5..a544b0324a 100644 --- a/epan/dissectors/packet-ecp-oui.c +++ b/epan/dissectors/packet-ecp-oui.c @@ -302,8 +302,8 @@ dissect_vdp_end_of_vdpdu_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * return -1; /* Force the VDP dissector to terminate */ } -static void -dissect_ecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_ecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *ecp_tree; proto_item *ti; @@ -348,7 +348,7 @@ dissect_ecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tempLen < 0) end = TRUE; } - + return tvb_captured_length(tvb); } void proto_register_ecp_oui(void) @@ -438,7 +438,7 @@ void proto_register_ecp_oui(void) proto_register_field_array(proto_ecp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("ecp", dissect_ecp, proto_ecp); + new_register_dissector("ecp", dissect_ecp, proto_ecp); } void proto_reg_handoff_ecp(void) -- cgit v1.2.3