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

1 files changed, 88 insertions, 88 deletions

diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c
index 91c3beed56..95e6db6ce1 100644
--- a/epan/dissectors/packet-pgm.c
+++ b/epan/dissectors/packet-pgm.c
@@ -1091,269 +1091,269 @@ proto_register_pgm(void)
   static hf_register_info hf[] = {
     { &hf_pgm_main_sport,
       { "Source Port", "pgm.hdr.sport", FT_UINT16, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_main_dport,
       { "Destination Port", "pgm.hdr.dport", FT_UINT16, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_port,
       { "Port", "pgm.port", FT_UINT16, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_main_type,
       { "Type", "pgm.hdr.type", FT_UINT8, BASE_HEX,
-	  VALS(type_vals), 0x0, "", HFILL }},
+	  VALS(type_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_main_opts,
       { "Options", "pgm.hdr.opts", FT_UINT8, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_main_opts_opt,
       { "Options", "pgm.hdr.opts.opt", FT_BOOLEAN, 8,
-	  TFS(&opts_present), PGM_OPT, "", HFILL }},
+	  TFS(&opts_present), PGM_OPT, NULL, HFILL }},
     { &hf_pgm_main_opts_netsig,
       { "Network Significant Options", "pgm.hdr.opts.netsig",
 	  FT_BOOLEAN, 8,
-	  TFS(&opts_present), PGM_OPT_NETSIG, "", HFILL }},
+	  TFS(&opts_present), PGM_OPT_NETSIG, NULL, HFILL }},
     { &hf_pgm_main_opts_varlen,
       { "Variable length Parity Packet Option", "pgm.hdr.opts.varlen",
 	  FT_BOOLEAN, 8,
-	  TFS(&opts_present), PGM_OPT_VAR_PKTLEN, "", HFILL }},
+	  TFS(&opts_present), PGM_OPT_VAR_PKTLEN, NULL, HFILL }},
     { &hf_pgm_main_opts_parity,
       { "Parity", "pgm.hdr.opts.parity", FT_BOOLEAN, 8,
-	  TFS(&opts_present), PGM_OPT_PARITY, "", HFILL }},
+	  TFS(&opts_present), PGM_OPT_PARITY, NULL, HFILL }},
     { &hf_pgm_main_cksum,
       { "Checksum", "pgm.hdr.cksum", FT_UINT16, BASE_HEX,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_main_cksum_bad,
       { "Bad Checksum", "pgm.hdr.cksum_bad", FT_BOOLEAN, BASE_NONE,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_main_gsi,
-      { "Global Source Identifier", "pgm.hdr.gsi", FT_BYTES, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+      { "Global Source Identifier", "pgm.hdr.gsi", FT_BYTES, BASE_NONE,
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_main_tsdulen,
       { "Transport Service Data Unit Length", "pgm.hdr.tsdulen", FT_UINT16,
-	  BASE_DEC, NULL, 0x0, "", HFILL }},
+	  BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_spm_sqn,
       { "Sequence number", "pgm.spm.sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_spm_trail,
       { "Trailing Edge Sequence Number", "pgm.spm.trail", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_spm_lead,
       { "Leading Edge Sequence Number", "pgm.spm.lead", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_spm_pathafi,
       { "Path NLA AFI", "pgm.spm.pathafi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_spm_res,
       { "Reserved", "pgm.spm.res", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_spm_path,
       { "Path NLA", "pgm.spm.path", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_spm_path6,
       { "Path NLA", "pgm.spm.path", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_data_sqn,
       { "Data Packet Sequence Number", "pgm.data.sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_data_trail,
       { "Trailing Edge Sequence Number", "pgm.data.trail", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_sqn,
       { "Requested Sequence Number", "pgm.nak.sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_srcafi,
       { "Source NLA AFI", "pgm.nak.srcafi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_nak_srcres,
       { "Reserved", "pgm.nak.srcres", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_src,
       { "Source NLA", "pgm.nak.src", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_src6,
       { "Source NLA", "pgm.nak.src", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_grpafi,
       { "Multicast Group AFI", "pgm.nak.grpafi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_nak_grpres,
       { "Reserved", "pgm.nak.grpres", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_grp,
       { "Multicast Group NLA", "pgm.nak.grp", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_grp6,
       { "Multicast Group NLA", "pgm.nak.grp", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_sqn,
       { "Sequence Number", "pgm.poll.sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_round,
       { "Round", "pgm.poll.round", FT_UINT16, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_subtype,
       { "Subtype", "pgm.poll.subtype", FT_UINT16, BASE_HEX,
-	  VALS(poll_subtype_vals), 0x0, "", HFILL }},
+	  VALS(poll_subtype_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_poll_pathafi,
       { "Path NLA AFI", "pgm.poll.pathafi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_poll_res,
       { "Reserved", "pgm.poll.res", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_path,
       { "Path NLA", "pgm.poll.path", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_path6,
       { "Path NLA", "pgm.poll.path", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_backoff_ivl,
       { "Back-off Interval", "pgm.poll.backoff_ivl", FT_UINT32, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_rand_str,
       { "Random String", "pgm.poll.rand_str", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_matching_bmask,
       { "Matching Bitmask", "pgm.poll.matching_bmask", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_polr_sqn,
       { "Sequence Number", "pgm.polr.sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_polr_round,
       { "Round", "pgm.polr.round", FT_UINT16, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_polr_res,
       { "Reserved", "pgm.polr.res", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_ack_sqn,
       { "Maximum Received Sequence Number", "pgm.ack.maxsqn", FT_UINT32,
-	  BASE_HEX, NULL, 0x0, "", HFILL }},
+	  BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_ack_bitmap,
       { "Packet Bitmap", "pgm.ack.bitmap", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_type,
       { "Type", "pgm.opts.type", FT_UINT8, BASE_HEX,
-          VALS(opt_vals), 0x0, "", HFILL }},
+          VALS(opt_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_opt_len,
       { "Length", "pgm.opts.len", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_tlen,
       { "Total Length", "pgm.opts.tlen", FT_UINT16, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_genopt_type,
       { "Type", "pgm.genopts.type", FT_UINT8, BASE_HEX,
-          VALS(opt_vals), 0x0, "", HFILL }},
+          VALS(opt_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_genopt_len,
       { "Length", "pgm.genopts.len", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_genopt_opx,
       { "Option Extensibility Bits", "pgm.genopts.opx", FT_UINT8, BASE_HEX,
-          VALS(opx_vals), 0x0, "", HFILL }},
+          VALS(opx_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_opt_parity_prm_po,
       { "Parity Parameters", "pgm.opts.parity_prm.op", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_parity_prm_prmtgsz,
       { "Transmission Group Size", "pgm.opts.parity_prm.prm_grp",
           FT_UINT32, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_join_res,
       { "Reserved", "pgm.opts.join.res", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_join_minjoin,
       { "Minimum Sequence Number", "pgm.opts.join.min_join",
-          FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+          FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_parity_grp_res,
       { "Reserved", "pgm.opts.parity_prm.op", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_parity_grp_prmgrp,
       { "Transmission Group Size", "pgm.opts.parity_prm.prm_grp",
           FT_UINT32, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_res,
       { "Reserved", "pgm.opts.nak.op", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_list,
       { "List", "pgm.opts.nak.list", FT_BYTES, BASE_NONE,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccdata_res,
       { "Reserved", "pgm.opts.ccdata.res", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccdata_tsp,
       { "Time Stamp", "pgm.opts.ccdata.tstamp", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccdata_afi,
       { "Acker AFI", "pgm.opts.ccdata.afi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccdata_res2,
       { "Reserved", "pgm.opts.ccdata.res2", FT_UINT16, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccdata_acker,
       { "Acker", "pgm.opts.ccdata.acker", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccdata_acker6,
       { "Acker", "pgm.opts.ccdata.acker", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccfeedbk_res,
       { "Reserved", "pgm.opts.ccdata.res", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccfeedbk_tsp,
       { "Time Stamp", "pgm.opts.ccdata.tstamp", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccfeedbk_afi,
       { "Acker AFI", "pgm.opts.ccdata.afi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccfeedbk_lossrate,
       { "Loss Rate", "pgm.opts.ccdata.lossrate", FT_UINT16, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccfeedbk_acker,
       { "Acker", "pgm.opts.ccdata.acker", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccfeedbk_acker6,
       { "Acker", "pgm.opts.ccdata.acker", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_bo_ivl_res,
       { "Reserved", "pgm.opts.nak_bo_ivl.res", FT_UINT8, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_bo_ivl_bo_ivl,
       { "Back-off Interval", "pgm.opts.nak_bo_ivl.bo_ivl", FT_UINT32, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_bo_ivl_bo_ivl_sqn,
       { "Back-off Interval Sequence Number", "pgm.opts.nak_bo_ivl.bo_ivl_sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_bo_rng_res,
       { "Reserved", "pgm.opts.nak_bo_rng.res", FT_UINT8, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_bo_rng_min_bo_ivl,
       { "Min Back-off Interval", "pgm.opts.nak_bo_rng.min_bo_ivl", FT_UINT32, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_bo_rng_max_bo_ivl,
       { "Max Back-off Interval", "pgm.opts.nak_bo_rng.max_bo_ivl", FT_UINT32, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_redirect_res,
       { "Reserved", "pgm.opts.redirect.res", FT_UINT8, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_redirect_afi,
       { "DLR AFI", "pgm.opts.redirect.afi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_opt_redirect_res2,
       { "Reserved", "pgm.opts.redirect.res2", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_redirect_dlr,
       { "DLR", "pgm.opts.redirect.dlr", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_redirect_dlr6,
       { "DLR", "pgm.opts.redirect.dlr", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_fragment_res,
       { "Reserved", "pgm.opts.fragment.res", FT_UINT8, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_fragment_first_sqn,
       { "First Sequence Number", "pgm.opts.fragment.first_sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_fragment_offset,
       { "Fragment Offset", "pgm.opts.fragment.fragment_offset", FT_UINT32, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_fragment_total_length,
       { "Total Length", "pgm.opts.fragment.total_length", FT_UINT32, BASE_DEC,
-	  NULL, 0x0, "", HFILL }}
+	  NULL, 0x0, NULL, HFILL }}
   };
   static gint *ett[] = {
 	&ett_pgm,