aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rfid-mifare.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-11-14 09:23:33 -0500
committerMichael Mann <mmann78@netscape.net>2015-11-14 21:54:27 +0000
commit28ea58251c04562cc0670e57bf073dc6966e73e6 (patch)
treeabe57292f17b280056a73ee7cfdc94abdcaaaaf3 /epan/dissectors/packet-rfid-mifare.c
parent13101020e12eb21e8464a3c4eb4fc2fe51409235 (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-rfid-mifare.c')
-rw-r--r--epan/dissectors/packet-rfid-mifare.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rfid-mifare.c b/epan/dissectors/packet-rfid-mifare.c
index b62a2c1ebd..8be7f0fa5b 100644
--- a/epan/dissectors/packet-rfid-mifare.c
+++ b/epan/dissectors/packet-rfid-mifare.c
@@ -71,8 +71,8 @@ static const value_string hf_mifare_commands[] = {
/* Subtree handles: set by register_subtree_array */
static gint ett_mifare = -1;
-static void
-dissect_mifare(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static int
+dissect_mifare(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
proto_item *item;
proto_tree *mifare_tree;
@@ -152,6 +152,7 @@ dissect_mifare(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "Unknown");
break;
}
+ return tvb_captured_length(tvb);
}
void
@@ -190,7 +191,7 @@ proto_register_mifare(void)
proto_register_field_array(proto_mifare, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- register_dissector("mifare", dissect_mifare, proto_mifare);
+ new_register_dissector("mifare", dissect_mifare, proto_mifare);
}
/*