From 20f3a9a632d49c2c1302a435b8db1a2e8051449b Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Sun, 24 Jul 2016 18:24:08 +0200 Subject: zvt: rename bitmap to bmp It looks like the specs call the first byte BMP and the whole record (BMP + content) is called the bitmap. Change-Id: I60ce75b131b3cddc59f614b8ca156ceacc890cf8 Reviewed-on: https://code.wireshark.org/review/16630 Reviewed-by: Martin Kaiser --- epan/dissectors/packet-zvt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epan/dissectors/packet-zvt.c b/epan/dissectors/packet-zvt.c index 80dc429601..5e3b556457 100644 --- a/epan/dissectors/packet-zvt.c +++ b/epan/dissectors/packet-zvt.c @@ -153,7 +153,7 @@ static int hf_zvt_reg_pwd = -1; static int hf_zvt_reg_cfg = -1; static int hf_zvt_cc = -1; static int hf_zvt_reg_svc_byte = -1; -static int hf_zvt_bitmap = -1; +static int hf_zvt_bmp = -1; static int hf_zvt_tlv_total_len = -1; static int hf_zvt_tlv_tag = -1; static int hf_zvt_tlv_tag_class = -1; @@ -373,7 +373,7 @@ dissect_zvt_bitmap(tvbuff_t *tvb, gint offset, if (try_val_to_str(bmp, bitmap) == NULL) return -1; - proto_tree_add_item(tree, hf_zvt_bitmap, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_zvt_bmp, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; switch (bmp) { @@ -846,8 +846,8 @@ proto_register_zvt(void) { &hf_zvt_reg_svc_byte, { "Service byte", "zvt.reg.service_byte", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } }, - { &hf_zvt_bitmap, - { "Bitmap", "zvt.bitmap", FT_UINT8, + { &hf_zvt_bmp, + { "BMP", "zvt.bmp", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &bitmap_ext, 0, NULL, HFILL } }, { &hf_zvt_tlv_total_len, { "Total length", "zvt.tlv.total_len", -- cgit v1.2.3