FT_BOOLEAN fields with bitmask: Display is 'parent bitfield width' not BASE...

Replace "" (or repeated text) blurbs in hf[] with NULL;

svn path=/trunk/; revision=28303

1 files changed, 48 insertions, 45 deletions

diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c
index c234a6da6d..dae789c4bd 100644
--- a/epan/dissectors/packet-fcip.c
+++ b/epan/dissectors/packet-fcip.c
@@ -136,7 +136,7 @@ static int hf_fcip_conn_flags = -1;
 static int ett_fcip            = -1;
 
 static guint fcip_port         = 3225;
-static gboolean fcip_desegment    = TRUE;
+static gboolean fcip_desegment = TRUE;
 
 static dissector_handle_t data_handle;
 static dissector_handle_t fc_handle;
@@ -543,79 +543,82 @@ proto_register_fcip (void)
     static hf_register_info hf[] = {
         { &hf_fcip_protocol,
 	  { "Protocol", "fcip.proto", FT_UINT8, BASE_DEC,
-	     VALS(fcencap_proto_vals), 0, "Protocol", HFILL }},
+            VALS(fcencap_proto_vals), 0, NULL, HFILL }},
         { &hf_fcip_protocol_c,
-          {"Protocol (1's Complement)", "fcip.protoc", FT_UINT8, BASE_DEC, NULL,
-           0, "Protocol (1's Complement)", HFILL}},
+          {"Protocol (1's Complement)", "fcip.protoc", FT_UINT8, BASE_DEC,
+           NULL, 0, NULL, HFILL}},
         { &hf_fcip_version,
-          {"Version", "fcip.version", FT_UINT8, BASE_DEC, NULL, 0, "",
-           HFILL}},
+          {"Version", "fcip.version", FT_UINT8, BASE_DEC, 
+           NULL, 0, NULL, HFILL}},
         { &hf_fcip_version_c,
           {"Version (1's Complement)", "fcip.versionc", FT_UINT8, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_fcip_encap_word1,
-          {"FCIP Encapsulation Word1", "fcip.encap_word1", FT_UINT32, BASE_HEX, NULL,
-           0, "", HFILL}},
+          {"FCIP Encapsulation Word1", "fcip.encap_word1", FT_UINT32, BASE_HEX,
+           NULL, 0, NULL, HFILL}},
         { &hf_fcip_flags,
-          {"Flags", "fcip.flags", FT_UINT8, BASE_HEX, NULL, 0xFC, "", HFILL}},
+          {"Flags", "fcip.flags", FT_UINT8, BASE_HEX, 
+           NULL, 0xFC, NULL, HFILL}},
         { &hf_fcip_flags_c,
           {"Flags (1's Complement)", "fcip.flagsc", FT_UINT8, BASE_HEX,
-           NULL, 0xFC, "", HFILL}},
+           NULL, 0xFC, NULL, HFILL}},
         { &hf_fcip_framelen,
           {"Frame Length (in Words)", "fcip.framelen", FT_UINT16, BASE_DEC,
-           NULL, 0x03FF, "", HFILL}},
+           NULL, 0x03FF, NULL, HFILL}},
         { &hf_fcip_framelen_c,
-          {"Frame Length (1's Complement)", "fcip.framelenc", FT_UINT16,
-           BASE_DEC, NULL, 0x03FF, "", HFILL}},
+          {"Frame Length (1's Complement)", "fcip.framelenc", FT_UINT16, BASE_DEC,
+           NULL, 0x03FF, NULL, HFILL}},
         { &hf_fcip_tsec,
-          {"Time (secs)", "fcip.tsec", FT_UINT32, BASE_DEC, NULL, 0, "",
-           HFILL}},
+          {"Time (secs)", "fcip.tsec", FT_UINT32, BASE_DEC, 
+           NULL, 0, NULL, HFILL}},
         { &hf_fcip_tusec,
-          {"Time (fraction)", "fcip.tusec", FT_UINT32, BASE_DEC, NULL, 0,
-           "", HFILL}},
+          {"Time (fraction)", "fcip.tusec", FT_UINT32, BASE_DEC, 
+           NULL, 0, NULL, HFILL}},
         { &hf_fcip_encap_crc,
-          {"CRC", "fcip.encap_crc", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL}},
+          {"CRC", "fcip.encap_crc", FT_UINT32, BASE_HEX,
+           NULL, 0, NULL, HFILL}},
         { &hf_fcip_sof,
-          {"SOF", "fcip.sof", FT_UINT8, BASE_HEX, VALS (&fcip_sof_vals), 0,
-           "", HFILL}},
+          {"SOF", "fcip.sof", FT_UINT8, BASE_HEX, 
+           VALS (&fcip_sof_vals), 0, NULL, HFILL}},
         { &hf_fcip_sof_c,
-          {"SOF (1's Complement)", "fcip.sofc", FT_UINT8, BASE_HEX, NULL,
-           0, "", HFILL}},
+          {"SOF (1's Complement)", "fcip.sofc", FT_UINT8, BASE_HEX, 
+           NULL, 0, NULL, HFILL}},
         { &hf_fcip_eof,
-          {"EOF", "fcip.eof", FT_UINT8, BASE_HEX, VALS (&fcip_eof_vals), 0,
-           "", HFILL}},
+          {"EOF", "fcip.eof", FT_UINT8, BASE_HEX, 
+           VALS (&fcip_eof_vals), 0, NULL, HFILL}},
         { &hf_fcip_eof_c,
-          {"EOF (1's Complement)", "fcip.eofc", FT_UINT8, BASE_HEX, NULL,
-           0, "", HFILL}},
+          {"EOF (1's Complement)", "fcip.eofc", FT_UINT8, BASE_HEX, 
+           NULL, 0, NULL, HFILL}},
         { &hf_fcip_pflags_changed,
-          {"Changed Flag", "fcip.pflags.ch", FT_BOOLEAN, BASE_DEC, NULL, 0x80,
-           "", HFILL}},
+          {"Changed Flag", "fcip.pflags.ch", FT_BOOLEAN, 8,
+           NULL, 0x80, NULL, HFILL}},
         { &hf_fcip_pflags_special,
-          {"Special Frame Flag", "fcip.pflags.sf", FT_BOOLEAN, BASE_DEC, NULL,
-           0x1, "", HFILL}},
+          {"Special Frame Flag", "fcip.pflags.sf", FT_BOOLEAN, 8,
+           NULL, 0x1, NULL, HFILL}},
         { &hf_fcip_pflags_c,
-          {"Pflags (1's Complement)", "fcip.pflagsc", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Pflags (1's Complement)", "fcip.pflagsc", FT_UINT8, BASE_HEX,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcip_src_wwn,
-          {"Source Fabric WWN", "fcip.srcwwn", FT_STRING, BASE_HEX, NULL, 0x0, 
-           "", HFILL}},
+          {"Source Fabric WWN", "fcip.srcwwn", FT_STRING, BASE_HEX,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcip_dst_wwn,
-          {"Destination Fabric WWN", "fcip.dstwwn", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Destination Fabric WWN", "fcip.dstwwn", FT_STRING, BASE_HEX,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcip_src_entity_id,
-          {"FC/FCIP Entity Id", "fcip.srcid", FT_BYTES, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"FC/FCIP Entity Id", "fcip.srcid", FT_BYTES, BASE_HEX,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcip_conn_flags,
           {"Connection Usage Flags", "fcip.connflags", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcip_conn_code,
-          {"Connection Usage Code", "fcip.conncode", FT_UINT16, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Connection Usage Code", "fcip.conncode", FT_UINT16, BASE_HEX,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcip_katov,
-          {"K_A_TOV", "fcip.katov", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+          {"K_A_TOV", "fcip.katov", FT_UINT32, BASE_DEC,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcip_conn_nonce,
-          {"Connection Nonce", "fcip.nonce", FT_BYTES, BASE_HEX, NULL, 0x0, "",
-           HFILL}},
+          {"Connection Nonce", "fcip.nonce", FT_BYTES, BASE_HEX,
+           NULL, 0x0, NULL, HFILL}},
     };
 
     static gint *ett[] = {