diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
| commit | c3af1555bb4c1eb47d86a0576d3dd7944572e6f5 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-ieee802a.c | |
| parent | 8210e1b06b7f866f3bc60e22b8fb54a12adba06c (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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ieee802a.c')
| -rw-r--r-- | epan/dissectors/packet-ieee802a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c index 284db8273c..94408fa8ff 100644 --- a/epan/dissectors/packet-ieee802a.c +++ b/epan/dissectors/packet-ieee802a.c @@ -154,11 +154,11 @@ proto_register_ieee802a(void) static hf_register_info hf[] = { { &hf_ieee802a_oui, { "Organization Code", "ieee802a.oui", FT_UINT24, BASE_HEX, - VALS(oui_vals), 0x0, "", HFILL }}, + VALS(oui_vals), 0x0, NULL, HFILL }}, { &hf_ieee802a_pid, { "Protocol ID", "ieee802a.pid", FT_UINT16, BASE_HEX, - NULL, 0x0, "", HFILL }} + NULL, 0x0, NULL, HFILL }} }; static gint *ett[] = { &ett_ieee802a, |