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-quake2.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-quake2.c')
-rw-r--r-- | epan/dissectors/packet-quake2.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c index 8051d3f4db..4849fd647c 100644 --- a/epan/dissectors/packet-quake2.c +++ b/epan/dissectors/packet-quake2.c @@ -791,27 +791,27 @@ proto_register_quake2(void) { &hf_quake2_c2s, { "Client to Server", "quake2.c2s", FT_UINT32, BASE_DEC, NULL, 0x0, - "Client to Server", HFILL }}, + NULL, HFILL }}, { &hf_quake2_s2c, { "Server to Client", "quake2.s2c", FT_UINT32, BASE_DEC, NULL, 0x0, - "Server to Client", HFILL }}, + NULL, HFILL }}, { &hf_quake2_connectionless, { "Connectionless", "quake2.connectionless", FT_UINT32, BASE_DEC, NULL, 0x0, - "Connectionless", HFILL }}, + NULL, HFILL }}, { &hf_quake2_game, { "Game", "quake2.game", FT_UINT32, BASE_DEC, NULL, 0x0, - "Game", HFILL }}, + NULL, HFILL }}, { &hf_quake2_connectionless_marker, { "Marker", "quake2.connectionless.marker", FT_UINT32, BASE_HEX, NULL, 0x0, - "Marker", HFILL }}, + NULL, HFILL }}, { &hf_quake2_connectionless_text, { "Text", "quake2.connectionless.text", - FT_STRING, BASE_DEC, NULL, 0x0, - "Text", HFILL }}, + FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL }}, { &hf_quake2_game_seq1, { "Sequence Number", "quake2.game.seq1", FT_UINT32, BASE_DEC, NULL, 0x0, @@ -856,42 +856,42 @@ proto_register_quake2(void) { "Angles (pitch)", "quake2.game.client.command.move.angles", FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), - CM_ANGLE1, "", HFILL }}, + CM_ANGLE1, NULL, HFILL }}, { &hf_quake2_game_client_command_move_bitfield_angles2, { "Angles (yaw)", "quake2.game.client.command.move.angles", FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), - CM_ANGLE2, "", HFILL }}, + CM_ANGLE2, NULL, HFILL }}, { &hf_quake2_game_client_command_move_bitfield_angles3, { "Angles (roll)", "quake2.game.client.command.move.angles", FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), - CM_ANGLE3, "", HFILL }}, + CM_ANGLE3, NULL, HFILL }}, { &hf_quake2_game_client_command_move_bitfield_movement_fwd, { "Movement (fwd)", "quake2.game.client.command.move.movement", FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), - CM_FORWARD, "", HFILL }}, + CM_FORWARD, NULL, HFILL }}, { &hf_quake2_game_client_command_move_bitfield_movement_side, { "Movement (side)", "quake2.game.client.command.move.movement", FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), - CM_SIDE, "", HFILL }}, + CM_SIDE, NULL, HFILL }}, { &hf_quake2_game_client_command_move_bitfield_movement_up, { "Movement (up)", "quake2.game.client.command.move.movement", FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), - CM_UP, "", HFILL }}, + CM_UP, NULL, HFILL }}, { &hf_quake2_game_client_command_move_bitfield_buttons, { "Buttons", "quake2.game.client.command.move.buttons", FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), - CM_BUTTONS, "", HFILL }}, + CM_BUTTONS, NULL, HFILL }}, { &hf_quake2_game_client_command_move_bitfield_impulse, { "Impulse", "quake2.game.client.command.move.impulse", FT_UINT8, BASE_HEX, VALS(hf_quake2_game_client_command_move_vals), - CM_IMPULSE, "", HFILL }}, + CM_IMPULSE, NULL, HFILL }}, { &hf_quake2_game_client_command_move_msec, { "Msec", "quake2.game.client.command.move.msec", FT_UINT8, BASE_DEC, NULL, 0x0, |