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-zbee-zcl-ha.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-zbee-zcl-ha.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-ha.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-ha.c b/epan/dissectors/packet-zbee-zcl-ha.c index 78022eb3f4..ea61de54af 100644 --- a/epan/dissectors/packet-zbee-zcl-ha.c +++ b/epan/dissectors/packet-zbee-zcl-ha.c @@ -216,10 +216,10 @@ static const value_string zbee_zcl_appl_idt_ceced_spec_ver_names[] = { * none *--------------------------------------------------------------- */ -static void -dissect_zbee_zcl_appl_idt(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) +static int +dissect_zbee_zcl_appl_idt(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void* data _U_) { - return; + return tvb_captured_length(tvb); } /*dissect_zbee_zcl_appl_idt*/ /*FUNCTION:------------------------------------------------------ @@ -355,7 +355,7 @@ proto_register_zbee_zcl_appl_idt(void) proto_register_subtree_array(ett, array_length(ett)); /* Register the ZigBee ZCL Appliance Identification dissector. */ - register_dissector(ZBEE_PROTOABBREV_ZCL_APPLIDT, dissect_zbee_zcl_appl_idt, proto_zbee_zcl_appl_idt); + new_register_dissector(ZBEE_PROTOABBREV_ZCL_APPLIDT, dissect_zbee_zcl_appl_idt, proto_zbee_zcl_appl_idt); } /*proto_register_zbee_zcl_appl_idt*/ /*FUNCTION:------------------------------------------------------ @@ -505,10 +505,10 @@ static const value_string zbee_zcl_met_idt_data_quality_names[] = { * none *--------------------------------------------------------------- */ -static void -dissect_zbee_zcl_met_idt(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) +static int +dissect_zbee_zcl_met_idt(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void* data _U_) { - return; + return tvb_captured_length(tvb); } /*dissect_zbee_zcl_met_idt*/ /*FUNCTION:------------------------------------------------------ @@ -586,7 +586,7 @@ proto_register_zbee_zcl_met_idt(void) proto_register_field_array(proto_zbee_zcl_met_idt, hf, array_length(hf)); /* Register the ZigBee ZCL Meter Identification dissector. */ - register_dissector(ZBEE_PROTOABBREV_ZCL_METIDT, dissect_zbee_zcl_met_idt, proto_zbee_zcl_met_idt); + new_register_dissector(ZBEE_PROTOABBREV_ZCL_METIDT, dissect_zbee_zcl_met_idt, proto_zbee_zcl_met_idt); } /*proto_register_zbee_zcl_met_idt*/ /*FUNCTION:------------------------------------------------------ |