aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-armagetronad.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2009-06-18 21:30:42 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2009-06-18 21:30:42 +0000
commitb228488bc0b9d5e0c63b15814836f7332f35ce04 (patch)
tree62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-armagetronad.c
parentdec6ea57aefdcebc4bacd3934606ad0d78da446e (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-armagetronad.c')
-rw-r--r--epan/dissectors/packet-armagetronad.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c
index 5f275bc769..d7f0d67abe 100644
--- a/epan/dissectors/packet-armagetronad.c
+++ b/epan/dissectors/packet-armagetronad.c
@@ -295,7 +295,7 @@ void proto_register_armagetronad(void)
},
{&hf_armagetronad_data,
{"Data", "armagetronad.data",
- FT_STRING, BASE_HEX, NULL, 0x0,
+ FT_STRING, BASE_NONE, NULL, 0x0,
"The actual data (array of shorts in network order)", HFILL}
},
{&hf_armagetronad_sender_id,
@@ -305,7 +305,7 @@ void proto_register_armagetronad(void)
},
{&hf_armagetronad_msg_subtree,
{"Message", "armagetronad.message",
- FT_NONE, 0, NULL, 0x0,
+ FT_NONE, BASE_NONE, NULL, 0x0,
"A message", HFILL}
}
};