diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
commit | b228488bc0b9d5e0c63b15814836f7332f35ce04 (patch) | |
tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-aim-messaging.c | |
parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) |
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
Diffstat (limited to 'epan/dissectors/packet-aim-messaging.c')
-rw-r--r-- | epan/dissectors/packet-aim-messaging.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c index 5c91d1573d..57226edf39 100644 --- a/epan/dissectors/packet-aim-messaging.c +++ b/epan/dissectors/packet-aim-messaging.c @@ -591,85 +591,85 @@ proto_register_aim_messaging(void) /* Setup list of header fields */ static hf_register_info hf[] = { { &hf_aim_icbm_channel, - { "Channel to setup", "aim_messaging.icbm.channel", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Channel to setup", "aim_messaging.icbm.channel", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_icbm_msg_flags, - { "Message Flags", "aim_messaging.icbm.flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Message Flags", "aim_messaging.icbm.flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_icbm_max_snac_size, - { "Max SNAC Size", "aim_messaging.icbm.max_snac", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Max SNAC Size", "aim_messaging.icbm.max_snac", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_icbm_max_sender_warnlevel, - { "Max sender warn level", "aim_messaging.icbm.max_sender_warn-level", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Max sender warn level", "aim_messaging.icbm.max_sender_warn-level", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_icbm_max_receiver_warnlevel, - { "max receiver warn level", "aim_messaging.icbm.max_receiver_warnlevel", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }, + { "max receiver warn level", "aim_messaging.icbm.max_receiver_warnlevel", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_icbm_min_msg_interval, - { "Minimum message interval (milliseconds)", "aim_messaging.icbm.min_msg_interval", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }, + { "Minimum message interval (milliseconds)", "aim_messaging.icbm.min_msg_interval", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_icbm_cookie, - { "ICBM Cookie", "aim_messaging.icbmcookie", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL } + { "ICBM Cookie", "aim_messaging.icbmcookie", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_aim_message_channel_id, - { "Message Channel ID", "aim_messaging.channelid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } + { "Message Channel ID", "aim_messaging.channelid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_aim_icbm_evil, - { "Send Evil Bit As", "aim_messaging.evilreq.origin", FT_UINT16, BASE_DEC, VALS(evil_origins), 0x0, "", HFILL }, + { "Send Evil Bit As", "aim_messaging.evilreq.origin", FT_UINT16, BASE_DEC, VALS(evil_origins), 0x0, NULL, HFILL }, }, { &hf_aim_evil_warn_level, - { "Old warning level", "aim_messaging.evil.warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }, + { "Old warning level", "aim_messaging.evil.warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_evil_new_warn_level, - { "New warning level", "aim_messaging.evil.new_warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }, + { "New warning level", "aim_messaging.evil.new_warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_icbm_notification_cookie, - { "Notification Cookie", "aim_messaging.notification.cookie", FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL }, + { "Notification Cookie", "aim_messaging.notification.cookie", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_icbm_notification_channel, - { "Notification Channel", "aim_messaging.notification.channel", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }, + { "Notification Channel", "aim_messaging.notification.channel", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_icbm_notification_type, - { "Notification Type", "aim_messaging.notification.type", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }, + { "Notification Type", "aim_messaging.notification.type", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_rendezvous_msg_type, - { "Message Type", "aim_messaging.rendezvous.msg_type", FT_UINT16, BASE_HEX, VALS(rendezvous_msg_types), 0x0, "", HFILL }, + { "Message Type", "aim_messaging.rendezvous.msg_type", FT_UINT16, BASE_HEX, VALS(rendezvous_msg_types), 0x0, NULL, HFILL }, }, { &hf_aim_icbm_clientautoresp_reason, - { "Reason", "aim_messaging.clientautoresp.reason", FT_UINT16, BASE_DEC, VALS(clientautoresp_reason_types), 0x0, "", HFILL }, + { "Reason", "aim_messaging.clientautoresp.reason", FT_UINT16, BASE_DEC, VALS(clientautoresp_reason_types), 0x0, NULL, HFILL }, }, { &hf_aim_icbm_clientautoresp_protocol_version, - { "Version", "aim_messaging.clientautoresp.protocol_version", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }, + { "Version", "aim_messaging.clientautoresp.protocol_version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_icbm_clientautoresp_client_caps_flags, - { "Client Capabilities Flags", "aim_messaging.clientautoresp.client_caps_flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Client Capabilities Flags", "aim_messaging.clientautoresp.client_caps_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_rendezvous_extended_data_message_type, - { "Message Type", "aim_messaging.icbm.extended_data.message.type", FT_UINT8, BASE_HEX, VALS(extended_data_message_types), 0x0, "", HFILL }, + { "Message Type", "aim_messaging.icbm.extended_data.message.type", FT_UINT8, BASE_HEX, VALS(extended_data_message_types), 0x0, NULL, HFILL }, }, { &hf_aim_rendezvous_extended_data_message_flags, - { "Message Flags", "aim_messaging.icbm.extended_data.message.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Message Flags", "aim_messaging.icbm.extended_data.message.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_rendezvous_extended_data_message_flags_normal, - { "Normal Message", "aim_messaging.icbm.extended_data.message.flags.normal", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_NORMAL, "", HFILL }, + { "Normal Message", "aim_messaging.icbm.extended_data.message.flags.normal", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_NORMAL, NULL, HFILL }, }, { &hf_aim_rendezvous_extended_data_message_flags_auto, - { "Auto Message", "aim_messaging.icbm.extended_data.message.flags.auto", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_AUTO, "", HFILL }, + { "Auto Message", "aim_messaging.icbm.extended_data.message.flags.auto", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_AUTO, NULL, HFILL }, }, { &hf_aim_rendezvous_extended_data_message_flags_multi, - { "Multiple Recipients Message", "aim_messaging.icbm.rendezvous.extended_data.message.flags.multi", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_MULTI, "", HFILL }, + { "Multiple Recipients Message", "aim_messaging.icbm.rendezvous.extended_data.message.flags.multi", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_MULTI, NULL, HFILL }, }, { &hf_aim_rendezvous_extended_data_message_status_code, - { "Status Code", "aim_messaging.icbm.extended_data.message.status_code", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }, + { "Status Code", "aim_messaging.icbm.extended_data.message.status_code", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_rendezvous_extended_data_message_priority_code, - { "Priority Code", "aim_messaging.icbm.extended_data.message.priority_code", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }, + { "Priority Code", "aim_messaging.icbm.extended_data.message.priority_code", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_rendezvous_extended_data_message_text_length, - { "Text Length", "aim_messaging.icbm.extended_data.message.text_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }, + { "Text Length", "aim_messaging.icbm.extended_data.message.text_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }, }, { &hf_aim_rendezvous_extended_data_message_text, - { "Text", "aim_messaging.icbm.extended_data.message.text", FT_STRING, BASE_HEX, NULL, 0x0, "", HFILL }, + { "Text", "aim_messaging.icbm.extended_data.message.text", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }, } }; |