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-bootparams.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-bootparams.c')
| -rw-r--r-- | epan/dissectors/packet-bootparams.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-bootparams.c b/epan/dissectors/packet-bootparams.c index 9dd28daa2a..78c4327b4b 100644 --- a/epan/dissectors/packet-bootparams.c +++ b/epan/dissectors/packet-bootparams.c @@ -158,28 +158,28 @@ proto_register_bootparams(void) static hf_register_info hf[] = { { &hf_bootparams_procedure_v1, { "V1 Procedure", "bootparams.procedure_v1", FT_UINT32, BASE_DEC, - VALS(bootparams1_proc_vals), 0, "V1 Procedure", HFILL }}, + VALS(bootparams1_proc_vals), 0, NULL, HFILL }}, { &hf_bootparams_host, { - "Client Host", "bootparams.host", FT_STRING, BASE_DEC, - NULL, 0, "Client Host", HFILL }}, + "Client Host", "bootparams.host", FT_STRING, BASE_NONE, + NULL, 0, NULL, HFILL }}, { &hf_bootparams_domain, { - "Client Domain", "bootparams.domain", FT_STRING, BASE_DEC, - NULL, 0, "Client Domain", HFILL }}, + "Client Domain", "bootparams.domain", FT_STRING, BASE_NONE, + NULL, 0, NULL, HFILL }}, { &hf_bootparams_fileid, { - "File ID", "bootparams.fileid", FT_STRING, BASE_DEC, - NULL, 0, "File ID", HFILL }}, + "File ID", "bootparams.fileid", FT_STRING, BASE_NONE, + NULL, 0, NULL, HFILL }}, { &hf_bootparams_filepath, { - "File Path", "bootparams.filepath", FT_STRING, BASE_DEC, - NULL, 0, "File Path", HFILL }}, + "File Path", "bootparams.filepath", FT_STRING, BASE_NONE, + NULL, 0, NULL, HFILL }}, { &hf_bootparams_hostaddr, { - "Client Address", "bootparams.hostaddr", FT_IPv4, BASE_DEC, + "Client Address", "bootparams.hostaddr", FT_IPv4, BASE_NONE, NULL, 0, "Address", HFILL }}, { &hf_bootparams_routeraddr, { - "Router Address", "bootparams.routeraddr", FT_IPv4, BASE_DEC, - NULL, 0, "Router Address", HFILL }}, + "Router Address", "bootparams.routeraddr", FT_IPv4, BASE_NONE, + NULL, 0, NULL, HFILL }}, { &hf_bootparams_addresstype, { "Address Type", "bootparams.type", FT_UINT32, BASE_DEC, - VALS(addr_type), 0, "Address Type", HFILL }}, + VALS(addr_type), 0, NULL, HFILL }}, }; static gint *ett[] = { &ett_bootparams, |