diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
commit | b228488bc0b9d5e0c63b15814836f7332f35ce04 (patch) | |
tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-h1.c | |
parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) |
From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero
svn path=/trunk/; revision=28770
Diffstat (limited to 'epan/dissectors/packet-h1.c')
-rw-r--r-- | epan/dissectors/packet-h1.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c index 909c2f657f..c73bad52b4 100644 --- a/epan/dissectors/packet-h1.c +++ b/epan/dissectors/packet-h1.c @@ -256,48 +256,48 @@ proto_register_h1 (void) static hf_register_info hf[] = { {&hf_h1_header, {"H1-Header", "h1.header", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, {&hf_h1_len, {"Length indicator", "h1.len", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, {&hf_h1_opfield, {"Operation identifier", "h1.opfield", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, {&hf_h1_oplen, - {"Operation length", "h1.oplen", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + {"Operation length", "h1.oplen", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, {&hf_h1_opcode, {"Opcode", "h1.opcode", FT_UINT8, BASE_HEX, VALS (opcode_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, {&hf_h1_requestblock, {"Request identifier", "h1.request", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, {&hf_h1_requestlen, {"Request length", "h1.reqlen", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, {&hf_h1_org, {"Memory type", "h1.org", FT_UINT8, BASE_HEX, VALS (org_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, {&hf_h1_dbnr, - {"Memory block number", "h1.dbnr", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }}, + {"Memory block number", "h1.dbnr", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, {&hf_h1_dwnr, {"Address within memory block", "h1.dwnr", FT_UINT16, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, {&hf_h1_dlen, - {"Length in words", "h1.dlen", FT_INT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + {"Length in words", "h1.dlen", FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, {&hf_h1_response, - {"Response identifier", "h1.response", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }}, + {"Response identifier", "h1.response", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }}, {&hf_h1_response_len, {"Response length", "h1.reslen", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, {&hf_h1_response_value, {"Response value", "h1.resvalue", FT_UINT8, BASE_DEC, - VALS (returncode_vals), 0x0, "", HFILL }}, + VALS (returncode_vals), 0x0, NULL, HFILL }}, {&hf_h1_empty, {"Empty field", "h1.empty", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, {&hf_h1_empty_len, {"Empty field length", "h1.empty_len", FT_UINT8, BASE_DEC, NULL, 0x0, - "", HFILL }} + NULL, HFILL }} }; static gint *ett[] = { |