From b228488bc0b9d5e0c63b15814836f7332f35ce04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= <stig@bjorlykke.org>
Date: Thu, 18 Jun 2009 21:30:42 +0000
Subject: 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
---
 epan/dissectors/packet-aodv.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'epan/dissectors/packet-aodv.c')

diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c
index 288d74566e..199663fb41 100644
--- a/epan/dissectors/packet-aodv.c
+++ b/epan/dissectors/packet-aodv.c
@@ -846,62 +846,62 @@ proto_register_aodv(void)
 	{ &hf_aodv_flags,
 	  { "Flags", "aodv.flags",
 	    FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "Flags", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rreq_join,
 	  { "RREQ Join", "aodv.flags.rreq_join",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_JOIN,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rreq_repair,
 	  { "RREQ Repair", "aodv.flags.rreq_repair",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_REP,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rreq_gratuitous,
 	  { "RREQ Gratuitous RREP", "aodv.flags.rreq_gratuitous",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_GRATRREP,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rreq_destinationonly,
 	  { "RREQ Destination only", "aodv.flags.rreq_destinationonly",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_DESTONLY,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rreq_unknown,
 	  { "RREQ Unknown Sequence Number", "aodv.flags.rreq_unknown",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_UNKNSEQ,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rrep_repair,
 	  { "RREP Repair", "aodv.flags.rrep_repair",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREP_REP,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rrep_ack,
 	  { "RREP Acknowledgement", "aodv.flags.rrep_ack",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREP_ACK_REQ,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rerr_nodelete,
 	  { "RERR No Delete", "aodv.flags.rerr_nodelete",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RERR_NODEL,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_prefix_sz,
 	  { "Prefix Size", "aodv.prefix_sz",
 	    FT_UINT8, BASE_DEC, NULL, 0x0,
-	    "Prefix Size", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_hopcount,
 	  { "Hop Count", "aodv.hopcount",
 	    FT_UINT8, BASE_DEC, NULL, 0x0,
-	    "Hop Count", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_rreq_id,
 	  { "RREQ Id", "aodv.rreq_id",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "RREQ Id", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_dest_ip,
 	  { "Destination IP", "aodv.dest_ip",
@@ -916,7 +916,7 @@ proto_register_aodv(void)
 	{ &hf_aodv_dest_seqno,
 	  { "Destination Sequence Number", "aodv.dest_seqno",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Destination Sequence Number", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_orig_ip,
 	  { "Originator IP", "aodv.orig_ip",
@@ -931,12 +931,12 @@ proto_register_aodv(void)
 	{ &hf_aodv_orig_seqno,
 	  { "Originator Sequence Number", "aodv.orig_seqno",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Originator Sequence Number", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_lifetime,
 	  { "Lifetime", "aodv.lifetime",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Lifetime", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_destcount,
 	  { "Destination Count", "aodv.destcount",
@@ -956,7 +956,7 @@ proto_register_aodv(void)
 	{ &hf_aodv_unreach_dest_seqno,
 	  { "Unreachable Destination Sequence Number", "aodv.unreach_dest_seqno",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Unreachable Destination Sequence Number", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_ext_type,
 	  { "Extension Type", "aodv.ext_type",
-- 
cgit v1.2.3