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, 43 insertions, 45 deletions

diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c
index 25e61bee0c..c143b9ef3a 100644
--- a/epan/dissectors/packet-p_mul.c
+++ b/epan/dissectors/packet-p_mul.c
@@ -1351,63 +1351,61 @@ void proto_register_p_mul (void)
   static hf_register_info hf[] = {
     { &hf_length,
       { "Length of PDU", "p_mul.length", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Length of PDU", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_priority,
       { "Priority", "p_mul.priority", FT_UINT8, BASE_DEC,
-        NULL, 0x0, "Priority", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_map_first,
       { "First", "p_mul.first", FT_BOOLEAN, 8,
-        TFS (&yes_no), 0x80, "First", HFILL } },
+        TFS (&yes_no), 0x80, NULL, HFILL } },
     { &hf_map_last,
       { "Last", "p_mul.last", FT_BOOLEAN, 8,
-        TFS (&yes_no), 0x40, "Last", HFILL } },
+        TFS (&yes_no), 0x40, NULL, HFILL } },
     { &hf_map_unused,
       { "MAP unused", "p_mul.unused", FT_UINT8, BASE_DEC,
-        NULL, 0xC0, "MAP unused", HFILL } },
+        NULL, 0xC0, NULL, HFILL } },
     { &hf_pdu_type,
       { "PDU Type", "p_mul.pdu_type", FT_UINT8, BASE_DEC,
-        VALS (pdu_vals), 0x3F, "PDU Type", HFILL } },
+        VALS (pdu_vals), 0x3F, NULL, HFILL } },
     { &hf_no_pdus,
       { "Total Number of PDUs", "p_mul.no_pdus", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Total Number of PDUs", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_seq_no,
       { "Sequence Number of PDUs", "p_mul.seq_no", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Sequence Number of PDUs", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_unused8,
       { "Unused", "p_mul.unused", FT_UINT8, BASE_DEC,
-        NULL, 0x0, "Unused", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_unused16,
       { "Unused", "p_mul.unused", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Unused", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_checksum,
       { "Checksum", "p_mul.checksum", FT_UINT16, BASE_HEX,
-        NULL, 0x0, "Checksum", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_checksum_good,
       { "Good", "p_mul.checksum_good", FT_BOOLEAN, BASE_NONE,
-        NULL, 0x0, "True: checksum matches packet content; "
-        "False: doesn't match content or not checked", HFILL } },
+        NULL, 0x0, "True: checksum matches packet content; False: doesn't match content or not checked", HFILL } },
     { &hf_checksum_bad,
       { "Bad", "p_mul.checksum_bad", FT_BOOLEAN, BASE_NONE,
-        NULL, 0x0, "True: checksum doesn't match packet content; "
-        "False: matches content or not checked", HFILL } },
+        NULL, 0x0, "True: checksum doesn't match packet content; False: matches content or not checked", HFILL } },
     { &hf_source_id_ack,
-      { "Source ID of Ack Sender", "p_mul.source_id_ack", FT_IPv4, BASE_DEC,
-        NULL, 0x0, "Source ID of Ack Sender", HFILL } },
+      { "Source ID of Ack Sender", "p_mul.source_id_ack", FT_IPv4, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
     { &hf_source_id,
-      { "Source ID", "p_mul.source_id", FT_IPv4, BASE_DEC,
-        NULL, 0x0, "Source ID", HFILL } },
+      { "Source ID", "p_mul.source_id", FT_IPv4, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
     { &hf_message_id,
       { "Message ID (MSID)", "p_mul.message_id", FT_UINT32, BASE_DEC,
         NULL, 0x0, "Message ID", HFILL } },
     { &hf_expiry_time,
-      { "Expiry Time", "p_mul.expiry_time", FT_ABSOLUTE_TIME, BASE_DEC,
-        NULL, 0x0, "Expiry Time", HFILL } },
+      { "Expiry Time", "p_mul.expiry_time", FT_ABSOLUTE_TIME, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
     { &hf_mc_group,
       { "Multicast Group", "p_mul.mc_group", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "Multicast Group", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_ann_mc_group,
       { "Announced Multicast Group", "p_mul.ann_mc_group", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "Announced Multicast Group", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_fec_len,
       { "FEC Parameter Length", "p_mul.fec.length", FT_UINT8, BASE_DEC,
         NULL, 0x0, "Forward Error Correction Parameter Length", HFILL } },
@@ -1419,76 +1417,76 @@ void proto_register_p_mul (void)
         NULL, 0x0, "Forward Error Correction Parameters", HFILL } },
     { &hf_count_of_dest,
       { "Count of Destination Entries", "p_mul.dest_count", FT_UINT16,BASE_DEC,
-        NULL, 0x0, "Count of Destination Entries", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_length_of_res,
       { "Length of Reserved Field", "p_mul.reserved_length",FT_UINT16,BASE_DEC,
-        NULL, 0x0, "Length of Reserved Field", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_ack_count,
       { "Count of Ack Info Entries", "p_mul.ack_count", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Count of Ack Info Entries", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_ack_entry,
       { "Ack Info Entry", "p_mul.ack_info_entry", FT_NONE, BASE_NONE,
-        NULL, 0x0, "Ack Info Entry", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_ack_length,
       { "Length of Ack Info Entry", "p_mul.ack_length", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Length of Ack Info Entry", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_miss_seq_no,
       { "Missing Data PDU Seq Number", "p_mul.missing_seq_no", FT_UINT16,
-        BASE_DEC, NULL, 0x0, "Missing Data PDU Seq Number", HFILL } },
+        BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_miss_seq_range,
       { "Missing Data PDU Seq Range", "p_mul.missing_seq_range", FT_BYTES,
-        BASE_DEC, NULL, 0x0, "Missing Data PDU Seq Range", HFILL } },
+        BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_tot_miss_seq_no,
       { "Total Number of Missing Data PDU Sequence Numbers", 
         "p_mul.no_missing_seq_no", FT_UINT16, BASE_DEC, NULL, 0x0, 
-        "Total Number of Missing Data PDU Sequence Numbers", HFILL } },
+        NULL, HFILL } },
     { &hf_timestamp_option,
       { "Timestamp Option", "p_mul.timestamp", FT_UINT64, BASE_DEC,
         NULL, 0x0, "Timestamp Option (in units of 100ms)", HFILL } },
     { &hf_dest_entry,
       { "Destination Entry", "p_mul.dest_entry", FT_NONE, BASE_NONE,
-        NULL, 0x0, "Destination Entry", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_dest_id,
-      { "Destination ID", "p_mul.dest_id", FT_IPv4, BASE_DEC,
-        NULL, 0x0, "Destination ID", HFILL } },
+      { "Destination ID", "p_mul.dest_id", FT_IPv4, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
     { &hf_msg_seq_no,
       { "Message Sequence Number", "p_mul.msg_seq_no", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Message Sequence Number", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_sym_key,
       { "Symmetric Key", "p_mul.sym_key", FT_NONE, BASE_NONE,
-        NULL, 0x0, "Symmetric Key", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_data_fragment,
       { "Fragment of Data", "p_mul.data_fragment", FT_NONE, BASE_NONE,
-        NULL, 0x0, "Fragment of Data", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
 
     /* Fragment entries */
     { &hf_msg_fragments,
       { "Message fragments", "p_mul.fragments", FT_NONE, BASE_NONE,
-        NULL, 0x00, "Message fragments", HFILL } },
+        NULL, 0x00, NULL, HFILL } },
     { &hf_msg_fragment,
       { "Message fragment", "p_mul.fragment", FT_FRAMENUM, BASE_NONE,
-        NULL, 0x00, "Message fragment", HFILL } },
+        NULL, 0x00, NULL, HFILL } },
     { &hf_msg_fragment_overlap,
       { "Message fragment overlap", "p_mul.fragment.overlap", FT_BOOLEAN,
-        BASE_NONE, NULL, 0x00, "Message fragment overlap", HFILL } },
+        BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_msg_fragment_overlap_conflicts,
       { "Message fragment overlapping with conflicting data",
         "p_mul.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL,
-        0x00, "Message fragment overlapping with conflicting data", HFILL } },
+        0x0, NULL, HFILL } },
     { &hf_msg_fragment_multiple_tails,
       { "Message has multiple tail fragments",
         "p_mul.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE,
-        NULL, 0x00, "Message has multiple tail fragments", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_msg_fragment_too_long_fragment,
       { "Message fragment too long", "p_mul.fragment.too_long_fragment",
-        FT_BOOLEAN, BASE_NONE, NULL, 0x00, "Message fragment too long",
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL,
         HFILL } },
     { &hf_msg_fragment_error,
       { "Message defragmentation error", "p_mul.fragment.error", FT_FRAMENUM,
-        BASE_NONE, NULL, 0x00, "Message defragmentation error", HFILL } },
+        BASE_NONE, NULL, 0x00, NULL, HFILL } },
     { &hf_msg_reassembled_in,
       { "Reassembled in", "p_mul.reassembled.in", FT_FRAMENUM, BASE_NONE,
-        NULL, 0x00, "Reassembled in", HFILL } },
+        NULL, 0x00, NULL, HFILL } },
 
     /*
     ** Ack matching / Resend