diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-06-18 21:30:42 +0000 |
| commit | c3af1555bb4c1eb47d86a0576d3dd7944572e6f5 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-ipxwan.c | |
| parent | 8210e1b06b7f866f3bc60e22b8fb54a12adba06c (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
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ipxwan.c')
| -rw-r--r-- | epan/dissectors/packet-ipxwan.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index 3871570bd9..2bbb9cc628 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.c @@ -368,81 +368,81 @@ proto_register_ipxwan(void) static hf_register_info hf[] = { { &hf_ipxwan_identifier, { "Identifier", "ipxwan.identifier", - FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_packet_type, { "Packet Type", "ipxwan.packet_type", - FT_UINT8, BASE_DEC, VALS(ipxwan_packet_type_vals), 0x0, "", + FT_UINT8, BASE_DEC, VALS(ipxwan_packet_type_vals), 0x0, NULL, HFILL }}, { &hf_ipxwan_node_id, { "Node ID", "ipxwan.node_id", FT_UINT32, - BASE_HEX, NULL, 0x0, "", HFILL }}, + BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_sequence_number, { "Sequence Number", "ipxwan.sequence_number", FT_UINT8, - BASE_DEC, NULL, 0x0, "", HFILL }}, + BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_num_options, { "Number of Options", "ipxwan.num_options", FT_UINT8, - BASE_DEC, NULL, 0x0, "", HFILL }}, + BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_option_num, { "Option Number", "ipxwan.option_num", FT_UINT8, - BASE_HEX, VALS(ipxwan_option_num_vals), 0x0, "", HFILL }}, + BASE_HEX, VALS(ipxwan_option_num_vals), 0x0, NULL, HFILL }}, { &hf_ipxwan_accept_option, { "Accept Option", "ipxwan.accept_option", FT_UINT8, - BASE_DEC, VALS(ipxwan_accept_option_vals), 0x0, "", HFILL }}, + BASE_DEC, VALS(ipxwan_accept_option_vals), 0x0, NULL, HFILL }}, { &hf_ipxwan_option_data_len, { "Option Data Length", "ipxwan.option_data_len", FT_UINT16, - BASE_DEC, NULL, 0x0, "", HFILL }}, + BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_routing_type, { "Routing Type", "ipxwan.routing_type", FT_UINT8, - BASE_DEC, VALS(ipxwan_routing_type_vals), 0x0, "", HFILL }}, + BASE_DEC, VALS(ipxwan_routing_type_vals), 0x0, NULL, HFILL }}, { &hf_ipxwan_wan_link_delay, { "WAN Link Delay", "ipxwan.rip_sap_info_exchange.wan_link_delay", - FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}, + FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_common_network_number, { "Common Network Number", "ipxwan.rip_sap_info_exchange.common_network_number", - FT_IPXNET, BASE_NONE, NULL, 0x0, "", HFILL }}, + FT_IPXNET, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_router_name, { "Router Name", "ipxwan.rip_sap_info_exchange.router_name", - FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_delay, { "Delay", "ipxwan.nlsp_information.delay", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_throughput, { "Throughput", "ipxwan.nlsp_information.throughput", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_request_size, { "Request Size", "ipxwan.nlsp_raw_throughput_data.request_size", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_delta_time, { "Delta Time", "ipxwan.nlsp_raw_throughput_data.delta_time", - FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}, + FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_extended_node_id, { "Extended Node ID", "ipxwan.extended_node_id", - FT_IPXNET, BASE_NONE, NULL, 0x0, "", HFILL }}, + FT_IPXNET, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_node_number, { "Node Number", "ipxwan.node_number", - FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL }}, + FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ipxwan_compression_type, { "Compression Type", "ipxwan.compression.type", FT_UINT8, BASE_DEC, VALS(ipxwan_compression_type_vals), 0x0, - "", HFILL }}, + NULL, HFILL }}, }; static gint *ett[] = { &ett_ipxwan, |