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, 26 insertions, 26 deletions

diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c
index 5f721cb42a..7e6e83745c 100644
--- a/epan/dissectors/packet-dec-dnart.c
+++ b/epan/dissectors/packet-dec-dnart.c
@@ -1325,7 +1325,7 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_ctrl_msg,
       { "Control packet",            "dec_dna.flags.control",
         FT_BOOLEAN,    8,        TFS(&tfs_yes_no),    RT_FLAGS_CTRL_MSG,
-          "Control packet", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_long_msg,
       { "Long data packet format",     "dec_dna.flags.msglen",
         FT_UINT8,    BASE_HEX,    NULL, 0x06,
@@ -1341,15 +1341,15 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_rts,
       { "Packet on return trip",    "dec_dna.flags.RTS",
         FT_BOOLEAN,    8,        TFS(&tfs_yes_no),    RT_FLAGS_RTS,
-          "Packet on return trip", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_inter_eth,
       { "Intra-ethernet packet",    "dec_dna.flags.intra_eth",
         FT_BOOLEAN,    8,        TFS(&tfs_yes_no),    RT_FLAGS_INTRA_ETHER,
-          "Intra-ethernet packet", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_discard,
       { "Discarded packet",            "dec_dna.flags.discard",
         FT_BOOLEAN,    8,        TFS(&tfs_yes_no),    RT_FLAGS_DISCARD,
-          "Discarded packet", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_dst_addr,
       { "Destination Address",        "dec_dna.dst.address",
         FT_ETHER,    BASE_NONE,    NULL,    0x0,
@@ -1373,7 +1373,7 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_visit_count,
       { "Visit count",            "dec_dna.visit_cnt",
         FT_UINT8,    BASE_HEX,    NULL,   0x0,
-          "Visit count", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_flow_control,
       { "Flow control",            "dec_dna.nsp.flow_control",
         FT_UINT8,    BASE_HEX,    VALS(&rt_flow_control_vals),   0x3,
@@ -1385,11 +1385,11 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_info,
       { "Version info",            "dec_dna.nsp.info",
         FT_UINT8,    BASE_HEX,    VALS(&rt_info_version_vals),   0x03,
-          "Version info", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_dst_node,
       { "Destination node",            "dec_dna.dst_node",
         FT_UINT16,    BASE_HEX,    NULL,   0x0,
-          "Destination node", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_seg_size,
       { "Maximum data segment size", "dec_dna.nsp.segsize",
         FT_UINT16,    BASE_DEC,    NULL,   0x0,
@@ -1397,7 +1397,7 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_src_node,
       { "Source node",            "dec_dna.src_node",
         FT_UINT16,    BASE_HEX,    NULL,   0x0,
-          "Source node", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_segnum,
       { "Message number",        "dec_dna.nsp.segnum",
         FT_UINT16,    BASE_DEC,    NULL,   0xfff,
@@ -1430,15 +1430,15 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_fc_val,
       { "Flow control",            "dec_dna.nsp.fc_val",
         FT_NONE,    BASE_NONE,    NULL,    0x0,
-          "Flow control", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_tiinfo,
       { "Routing information",    "dec_dna.ctl.tiinfo",
         FT_UINT8,    BASE_HEX,    VALS(&rt_tiinfo_vals), 0x0,
-          "Routing information", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_blk_size,
       { "Block size",            "dec_dna.ctl.blk_size",
         FT_UINT16,    BASE_DEC,    NULL,    0x0,
-          "Block size", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_disc_reason,
       { "Reason for disconnect","dec_dna.nsp.disc_reason",
         FT_UINT16,    BASE_HEX,    VALS(&rt_disc_reason_vals),    0x0,
@@ -1454,7 +1454,7 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_reserved,
       { "Reserved", "dec_dna.ctl.reserved",
          FT_BYTES, BASE_NONE, NULL, 0x0,
-         "Reserved", HFILL }},
+         NULL, HFILL }},
     { &hf_dec_rt_fcnval,
       { "Verification message function value", "dec_dna.ctl.fcnval",
          FT_BYTES, BASE_NONE, NULL, 0x0,
@@ -1470,15 +1470,15 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_id,
       { "Transmitting system ID",            "dec_dna.ctl.id",
         FT_ETHER,    BASE_NONE,    NULL,    0x0,
-          "Transmitting system ID", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_iinfo,
       { "Routing information",        "dec_dna.ctl.tiinfo",
         FT_UINT8,    BASE_HEX,    NULL, 0x0,
-          "Routing information", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_iinfo_node_type,
       { "Node type",            "dec_dna.ctl.iinfo.node_type",
         FT_UINT8,    BASE_HEX,    VALS(&rt_iinfo_node_type_vals),    0x03,
-          "Node type", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_iinfo_vrf,
       { "Verification required",            "dec_dna.ctl.iinfo.vrf",
         FT_BOOLEAN,    8,        TFS(&tfs_yes_no),    0x4,
@@ -1502,7 +1502,7 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_iprio,
       { "Routing priority",        "dec_dna.ctl.prio",
         FT_UINT8,    BASE_HEX,    NULL, 0x0,
-          "Routing priority", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_neighbor,
       { "Neighbor",                "dec_dna.ctl_neighbor",
         FT_ETHER,    BASE_NONE,    NULL,    0x0,
@@ -1510,31 +1510,31 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_seed,
       { "Verification seed",    "dec_dna.ctl.seed",
         FT_BYTES,    BASE_NONE,    NULL, 0x0,
-          "Verification seed", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_elist,
       { "List of router states",    "dec_dna.ctl.elist",
         FT_NONE,    BASE_NONE,    NULL, 0x0,
           "Router states", HFILL }},
     { &hf_dec_rt_ename,
       { "Ethernet name",      "dec_dna.ctl.ename",
-        FT_BYTES,    BASE_HEX,    NULL,    0x0,
-          "Ethernet name", HFILL }},
+        FT_BYTES,    BASE_NONE,    NULL,    0x0,
+          NULL, HFILL }},
     { &hf_dec_rt_router_id,
       { "Router ID",                "dec_dna.ctl.router_id",
         FT_ETHER,    BASE_NONE,    NULL,    0x0,
-          "Router ID", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_router_state,
       { "Router state",    "dec_dna.ctl.router_state",
         FT_STRING,    BASE_NONE,    NULL, 0x0,
-          "Router state", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_conn_contents,
       { "Session connect data",    "dec_dna.sess.conn",
         FT_NONE,    BASE_NONE,    NULL, 0x0,
-          "Session connect data", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_router_prio,
       { "Router priority",    "dec_dna.ctl.router_prio",
         FT_UINT8,    BASE_HEX,    NULL, 0x7f,
-          "Router priority", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_sess_grp_code,
       { "Session Group code",    "dec_dna.sess.grp_code",
         FT_UINT16,    BASE_HEX,    NULL, 0x0,
@@ -1542,15 +1542,15 @@ proto_register_dec_rt(void)
     { &hf_dec_sess_usr_code,
       { "Session User code",    "dec_dna.sess.usr_code",
         FT_UINT16,    BASE_HEX,    NULL, 0x0,
-          "Session User code", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_sess_dst_name,
       { "Session Destination end user",    "dec_dna.sess.dst_name",
         FT_STRING,    BASE_NONE,    NULL, 0x0,
-          "Session Destination end user", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_sess_src_name,
       { "Session Source end user",    "dec_dna.sess.src_name",
         FT_STRING,    BASE_NONE,    NULL, 0x0,
-          "Session Source end user", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_sess_obj_type,
       { "Session Object type",    "dec_dna.sess.obj_type",
         FT_UINT8,    BASE_HEX,    NULL, 0x0,