From 75f1e13c12a7c41ce35b2085878066c6f9ad938e Mon Sep 17 00:00:00 2001 From: Jaap Keuter Date: Wed, 7 Oct 2009 23:08:22 +0000 Subject: [PATCH] Cleanup header fields. svn path=/trunk/; revision=30394 --- epan/dissectors/packet-collectd.c | 8 ++++---- epan/dissectors/packet-gsm_a_rr.c | 2 +- epan/dissectors/packet-nb_rtpmux.c | 2 +- epan/dissectors/packet-ntlmssp.c | 22 +++++++++++----------- epan/dissectors/packet-redbackli.c | 2 +- epan/dissectors/packet-smb.c | 2 +- epan/dissectors/packet-tn3270.c | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index 1d933c10ba..eda9c866a4 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -1324,7 +1324,7 @@ void proto_register_collectd(void) NULL, 0x0, NULL, HFILL } }, { &hf_collectd_data, - { "Payload", "collectd.data", FT_BYTES, BASE_HEX, + { "Payload", "collectd.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_collectd_data_host, @@ -1392,11 +1392,11 @@ void proto_register_collectd(void) NULL, 0x0, NULL, HFILL } }, { &hf_collectd_data_sighash, - { "Signature", "collectd.data.sighash", FT_BYTES, BASE_HEX, + { "Signature", "collectd.data.sighash", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_collectd_data_initvec, - { "Init vector", "collectd.data.initvec", FT_BYTES, BASE_HEX, + { "Init vector", "collectd.data.initvec", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_collectd_data_username_len, @@ -1408,7 +1408,7 @@ void proto_register_collectd(void) NULL, 0x0, NULL, HFILL } }, { &hf_collectd_data_encrypted, - { "Encrypted data", "collectd.data.encrypted", FT_BYTES, BASE_HEX, + { "Encrypted data", "collectd.data.encrypted", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, }; diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index d708e02bf6..cc6f332d00 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -9216,7 +9216,7 @@ proto_register_gsm_a_rr(void) }, { &hf_gsm_a_rr_apdu_data, { "APDU Data","gsm_a.rr.apdu_data", - FT_BYTES,BASE_HEX, NULL, 0x00, + FT_BYTES,BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_gsm_a_rr_set_of_amr_codec_modes_v1_b8, diff --git a/epan/dissectors/packet-nb_rtpmux.c b/epan/dissectors/packet-nb_rtpmux.c index e988df3894..5c051d5693 100644 --- a/epan/dissectors/packet-nb_rtpmux.c +++ b/epan/dissectors/packet-nb_rtpmux.c @@ -171,7 +171,7 @@ proto_register_nb_rtpmux(void) }, { &hf_nb_rtpmux_data, { "RTP Packet", "nb_rtpmux.data", - FT_BYTES, BASE_HEX, NULL, 0x00, + FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL } } }; diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 53f4206753..88221451ae 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -2491,7 +2491,7 @@ proto_register_ntlmssp(void) { &hf_ntlmssp, { "NTLMSSP", "ntlmssp", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_auth, - { "NTLMSSP identifier", "ntlmssp.identifier", FT_STRING, BASE_NONE, NULL, 0x0, "NTLMSSP Identifier", HFILL }}, + { "NTLMSSP identifier", "ntlmssp.identifier", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_message_type, { "NTLM Message Type", "ntlmssp.messagetype", FT_UINT32, BASE_HEX, VALS(ntlmssp_message_types), 0x0, NULL, HFILL }}, { &hf_ntlmssp_negotiate_flags, @@ -2535,7 +2535,7 @@ proto_register_ntlmssp(void) { &hf_ntlmssp_negotiate_flags_40000, { "Target Type Share", "ntlmssp.targettypeshare", FT_BOOLEAN, 32, TFS (&tfs_set_notset), NTLMSSP_TARGET_TYPE_SHARE, NULL, HFILL }}, { &hf_ntlmssp_negotiate_flags_80000, - { "Negotiate Extended Security", "ntlmssp.negotiatentlm2", FT_BOOLEAN, 32, TFS (&tfs_set_notset), NTLMSSP_NEGOTIATE_EXTENDED_SECURITY, "", HFILL }}, + { "Negotiate Extended Security", "ntlmssp.negotiatentlm2", FT_BOOLEAN, 32, TFS (&tfs_set_notset), NTLMSSP_NEGOTIATE_EXTENDED_SECURITY, NULL, HFILL }}, { &hf_ntlmssp_negotiate_flags_100000, { "Negotiate Identify", "ntlmssp.negotiateidentify", FT_BOOLEAN, 32, TFS (&tfs_set_notset), NTLMSSP_NEGOTIATE_IDENTIFY, NULL, HFILL }}, { &hf_ntlmssp_negotiate_flags_200000, @@ -2577,9 +2577,9 @@ proto_register_ntlmssp(void) { &hf_ntlmssp_negotiate_domain, { "Calling workstation domain", "ntlmssp.negotiate.domain", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_ntlm_client_challenge, - { "NTLM Client Challenge", "ntlmssp.ntlmclientchallenge", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "NTLM Client Challenge", "ntlmssp.ntlmclientchallenge", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_ntlm_server_challenge, - { "NTLM Server Challenge", "ntlmssp.ntlmserverchallenge", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "NTLM Server Challenge", "ntlmssp.ntlmserverchallenge", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_reserved, { "Reserved", "ntlmssp.reserved", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_challenge_domain, @@ -2641,13 +2641,13 @@ proto_register_ntlmssp(void) { &hf_ntlmssp_decrypted_payload, { "NTLM Decrypted Payload", "ntlmssp.decrypted_payload", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_verf_randompad, - { "Random Pad", "ntlmssp.verf.randompad", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Random Pad", "ntlmssp.verf.randompad", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_verf_crc32, { "Verifier CRC32", "ntlmssp.verf.crc32", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_verf_hmacmd5, - { "HMAC MD5", "ntlmssp.verf.hmacmd5", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "HMAC MD5", "ntlmssp.verf.hmacmd5", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_verf_sequence, - { "Sequence", "ntlmssp.verf.sequence", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Sequence", "ntlmssp.verf.sequence", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_ntlmv2_response, { "NTLMv2 Response", "ntlmssp.ntlmv2response", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_ntlmv2_response_hmac, @@ -2663,13 +2663,13 @@ proto_register_ntlmssp(void) { &hf_ntlmssp_ntlmv2_response_unknown, { "Unknown", "ntlmssp.ntlmv2response.unknown", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_ntlmv2_response_name, - { "Attribute", "ntlmssp.ntlmv2response.name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + { "Attribute", "ntlmssp.ntlmv2response.name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_ntlmv2_response_name_type, - { "Attribute type", "ntlmssp.ntlmv2response.name.type", FT_UINT32, BASE_DEC, VALS(ntlm_name_types), 0x0, "", HFILL }}, + { "Attribute type", "ntlmssp.ntlmv2response.name.type", FT_UINT32, BASE_DEC, VALS(ntlm_name_types), 0x0, NULL, HFILL }}, { &hf_ntlmssp_ntlmv2_response_name_len, - { "Value len", "ntlmssp.ntlmv2response.name.len", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + { "Value len", "ntlmssp.ntlmv2response.name.len", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_ntlmv2_response_restriction, - { "Encoding restrictions", "ntlmssp.ntlmv2response.name.restrictions", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }}, + { "Encoding restrictions", "ntlmssp.ntlmv2response.name.restrictions", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ntlmssp_ntlmv2_response_client_time, { "Client Time", "ntlmssp.ntlmv2response.client_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }} }; diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c index c5c2546440..16fa60e8ba 100644 --- a/epan/dissectors/packet-redbackli.c +++ b/epan/dissectors/packet-redbackli.c @@ -256,7 +256,7 @@ void proto_register_redbackli(void) { (even though 'direction' sounds like a fixed length field */ { "Direction", "redbackli.dir", FT_UINT8, BASE_DEC, NULL, 0x0, #endif - { "Direction", "redbackli.dir", FT_BYTES, BASE_DEC, NULL, 0x0, + { "Direction", "redbackli.dir", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_redbackli_label, { "Label", "redbackli.label", FT_STRING, BASE_NONE, NULL, 0x0, diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index 5e3eecab30..2f27727291 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -18760,7 +18760,7 @@ proto_register_smb(void) NULL, 0, "Dfs expanded name", HFILL }}, { &hf_smb_dfs_referral_server_guid, - { "Server GUID", "smb.dfs.referral.server_guid", FT_BYTES, BASE_HEX, + { "Server GUID", "smb.dfs.referral.server_guid", FT_BYTES, BASE_NONE, NULL, 0, "Globally unique identifier for this server", HFILL }}, { &hf_smb_end_of_search, diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index afd3491bd1..a8c837aaff 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -4327,7 +4327,7 @@ proto_register_tn3270(void) NULL, HFILL }}, { &hf_tn3270_scs_data, { "SCS data (noncompressed and noncompacted) to set up for restart", "tn3270.scs_data", - FT_BYTES, BASE_HEX, NULL, 0x0, + FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, /* End - 5.22 - Restart */ @@ -5403,7 +5403,7 @@ proto_register_tn3270(void) NULL, HFILL }}, { &hf_tn3270_unknown_data, { "Unknown Data (Possible Mainframe/Emulator Bug)", "tn3270.unknown_data", - FT_EBCDIC, BASE_HEX, NULL, 0x0, + FT_EBCDIC, BASE_NONE, NULL, 0x0, NULL, HFILL }}, /*TN3270E - Header Fields */