diff options
Diffstat (limited to 'epan/dissectors/packet-rfid-mifare.c')
| -rw-r--r-- | epan/dissectors/packet-rfid-mifare.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-rfid-mifare.c b/epan/dissectors/packet-rfid-mifare.c index 2cb45dae..2a2f8def 100644 --- a/epan/dissectors/packet-rfid-mifare.c +++ b/epan/dissectors/packet-rfid-mifare.c @@ -22,15 +22,15 @@ void proto_register_mifare(void); -static int proto_mifare = -1; +static int proto_mifare; -static int hf_mifare_command = -1; -static int hf_mifare_block_address = -1; -static int hf_mifare_key_a = -1; -static int hf_mifare_key_b = -1; -static int hf_mifare_uid = -1; -static int hf_mifare_operand = -1; -static int hf_mifare_payload = -1; +static int hf_mifare_command; +static int hf_mifare_block_address; +static int hf_mifare_key_a; +static int hf_mifare_key_b; +static int hf_mifare_uid; +static int hf_mifare_operand; +static int hf_mifare_payload; #define AUTH_A 0x60 #define AUTH_B 0x61 @@ -56,14 +56,14 @@ static const value_string hf_mifare_commands[] = { }; /* Subtree handles: set by register_subtree_array */ -static gint ett_mifare = -1; +static int ett_mifare; static int dissect_mifare(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *item; proto_tree *mifare_tree; - guint8 cmd; + uint8_t cmd; col_set_str(pinfo->cinfo, COL_PROTOCOL, "MiFare"); @@ -75,7 +75,7 @@ dissect_mifare(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ mifare_tree = proto_item_add_subtree(item, ett_mifare); proto_tree_add_item(mifare_tree, hf_mifare_command, tvb, 0, 1, ENC_BIG_ENDIAN); - cmd = tvb_get_guint8(tvb, 0); + cmd = tvb_get_uint8(tvb, 0); switch (cmd) { @@ -170,7 +170,7 @@ proto_register_mifare(void) NULL, 0x0, NULL, HFILL }} }; - static gint *ett[] = { + static int *ett[] = { &ett_mifare }; |