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

diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c
index 4aaad9e52c..3865f454a5 100644
--- a/epan/dissectors/packet-dcerpc-rs_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_pgo.c
@@ -1698,164 +1698,164 @@ proto_register_rs_pgo (void)
   static hf_register_info hf[] = {
     {&hf_rs_pgo_opnum,
      {"Operation", "rs_pgo.opnum", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "Operation", HFILL}},
+      NULL, HFILL}},
     {&hf_error_status_t,
      {"hf_error_status_t", "hf_error_status_t", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_rgy_acct_user_flags_t,
      {"hf_rgy_acct_user_flags_t", "hf_rgy_acct_user_flags_t", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_get_rqst_key_size,
      {"hf_rgy_get_rqst_key_size", "hf_rgy_get_rqst_key_size", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_get_rqst_key_t,
      {"hf_rgy_get_rqst_key_t", "hf_rgy_get_rqst_key_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_get_rqst_name_domain,
      {"hf_rgy_get_rqst_name_domain", "hf_rgy_get_rqst_name_domain",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_get_rqst_var,
      {"hf_rgy_get_rqst_var", "hf_rgy_get_rqst_var", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_get_rqst_var2,
      {"hf_rgy_get_rqst_var2", "hf_rgy_get_rqst_var2", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_key1,
      {"hf_rgy_is_member_rqst_key1", "hf_rgy_is_member_rqst_key1", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_key1_size,
      {"hf_rgy_is_member_rqst_key1_size", "hf_rgy_is_member_rqst_key1_size",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_key2,
      {"hf_rgy_is_member_rqst_key2", "hf_rgy_is_member_rqst_key2", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_key2_size,
      {"hf_rgy_is_member_rqst_key2_size", "hf_rgy_is_member_rqst_key2_size",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_var1,
      {"hf_rgy_is_member_rqst_var1", "hf_rgy_is_member_rqst_var1", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_var2,
      {"hf_rgy_is_member_rqst_var2", "hf_rgy_is_member_rqst_var2", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_var3,
      {"hf_rgy_is_member_rqst_var3", "hf_rgy_is_member_rqst_var3", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_var4,
      {"hf_rgy_is_member_rqst_var4", "hf_rgy_is_member_rqst_var4", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_key_transfer_rqst_var1,
      {"hf_rgy_key_transfer_rqst_var1", "hf_rgy_key_transfer_rqst_var1",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_key_transfer_rqst_var2,
      {"hf_rgy_key_transfer_rqst_var2", "hf_rgy_key_transfer_rqst_var2",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_key_transfer_rqst_var3,
      {"hf_rgy_key_transfer_rqst_var3", "hf_rgy_key_transfer_rqst_var3",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_name_domain,
      {"hf_rgy_name_domain", "hf_rgy_name_domain", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_rgy_sec_rgy_name_max_len,
      {"hf_rgy_sec_rgy_name_max_len", "hf_rgy_sec_rgy_name_max_len",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_sec_rgy_name_t,
      {"hf_rgy_sec_rgy_name_t", "hf_rgy_sec_rgy_name_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_sec_rgy_name_t_size,
      {"hf_rgy_sec_rgy_name_t_size", "hf_rgy_sec_rgy_name_t_size", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rs_pgo_id_key_t,
      {"hf_rs_pgo_id_key_t", "hf_rs_pgo_id_key_t", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_rs_pgo_query_key_t,
      {"hf_rs_pgo_query_key_t", "hf_rs_pgo_query_key_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_rs_pgo_query_result_t,
      {"hf_rs_pgo_query_result_t", "hf_rs_pgo_query_result_t", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rs_pgo_query_t,
      {"hf_rs_pgo_query_t", "hf_rs_pgo_query_t", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_rs_sec_rgy_pgo_item_t_quota,
      {"hf_rs_sec_rgy_pgo_item_t_quota", "hf_rs_sec_rgy_pgo_item_t_quota",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rs_sec_rgy_pgo_item_t_unix_num,
      {"hf_rs_sec_rgy_pgo_item_t_unix_num",
-      "hf_rs_sec_rgy_pgo_item_t_unix_num", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+      "hf_rs_sec_rgy_pgo_item_t_unix_num", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_rs_timeval,
-     {"hf_rs_timeval", "hf_rs_timeval", FT_RELATIVE_TIME, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+     {"hf_rs_timeval", "hf_rs_timeval", FT_RELATIVE_TIME, BASE_NONE, NULL,
+      0x0, NULL, HFILL}},
     {&hf_rs_uuid1,
      {"hf_rs_uuid1", "hf_rs_uuid1", FT_GUID, BASE_NONE, NULL, 0x0, "UUID",
       HFILL}},
     {&hf_rs_var1,
-     {"hf_rs_var1", "hf_rs_var1", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"hf_rs_var1", "hf_rs_var1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_sec_attr_component_name_t_handle,
      {"hf_sec_attr_component_name_t_handle",
       "hf_sec_attr_component_name_t_handle", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_sec_attr_component_name_t_valid,
      {"hf_sec_attr_component_name_t_valid",
       "hf_sec_attr_component_name_t_valid", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_sec_passwd_type_t,
      {"hf_sec_passwd_type_t", "hf_sec_passwd_type_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_sec_passwd_version_t,
      {"hf_sec_passwd_version_t", "hf_sec_passwd_version_t", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_acct_admin_flags,
      {"hf_sec_rgy_acct_admin_flags", "hf_sec_rgy_acct_admin_flags",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_acct_auth_flags_t,
      {"hf_sec_rgy_acct_auth_flags_t", "hf_sec_rgy_acct_auth_flags_t",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_acct_key_t,
      {"hf_sec_rgy_acct_key_t", "hf_sec_rgy_acct_key_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_domain_t,
      {"hf_sec_rgy_domain_t", "hf_sec_rgy_domain_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_name_t_principalName_string,
      {"hf_sec_rgy_name_t_principalName_string",
       "hf_sec_rgy_name_t_principalName_string", FT_STRING, BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_sec_rgy_name_t_size,
      {"hf_sec_rgy_name_t_size", "hf_sec_rgy_name_t_size", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_pgo_flags_t,
      {"hf_sec_rgy_pgo_flags_t", "hf_sec_rgy_pgo_flags_t", FT_UINT32,
-      BASE_HEX, NULL, 0x0, "", HFILL}},
+      BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_pgo_item_t,
      {"hf_sec_rgy_pgo_item_t", "hf_sec_rgy_pgo_item_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_pname_t_size,
      {"hf_sec_rgy_pname_t_size",
       "hf_sec_rgy_pname_t_size", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_sec_rgy_pname_t_principalName_string,
      {"hf_sec_rgy_pname_t_principalName_string",
       "hf_sec_rgy_pname_t_principalName_string", FT_STRING, BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_sec_rgy_unix_sid_t_group,
      {"hf_sec_rgy_unix_sid_t_group", "hf_sec_rgy_unix_sid_t_group",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_unix_sid_t_org,
      {"hf_sec_rgy_unix_sid_t_org", "hf_sec_rgy_unix_sid_t_org", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_unix_sid_t_person,
      {"hf_sec_rgy_unix_sid_t_person", "hf_sec_rgy_unix_sid_t_person",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_timeval_sec_t,
      {"hf_sec_timeval_sec_t", "hf_sec_timeval_sec_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_rs_pgo_unix_num_key_t,
      {"hf_rs_pgo_unix_num_key_t", "hf_rs_pgo_unix_num_key_t", FT_UINT32,
       BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
 
   };