diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-04-17 21:52:51 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-04-18 13:39:40 +0000 |
| commit | 0012214facc35f92536354d77dfde74f1347cdf9 (patch) | |
| tree | 73986fc095c86f3be3ca1ca8c99d09ea43ede20c /epan/dissectors/x11-register-info.h | |
| parent | d46adfe75377323508dbf9443f35baa81e4a2471 (diff) | |
X11: General cleanup
1. Replace bitmask macros with proto_tree_add_bitmask + bitmask field handling
2. Replace REQUEST_LENGTH macro with actual function.
Change-Id: Ibb3b2bc8c9d0556092af0e3dc384a4aad6c07ac2
Reviewed-on: https://code.wireshark.org/review/21185
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/x11-register-info.h')
| -rw-r--r-- | epan/dissectors/x11-register-info.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h index 90a0bb32c9..dc65713acf 100644 --- a/epan/dissectors/x11-register-info.h +++ b/epan/dissectors/x11-register-info.h @@ -63,7 +63,7 @@ { &hf_x11_bell_duration, { "bell-duration", "x11.bell-duration", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_bell_percent, { "bell-percent", "x11.bell-percent", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_bell_pitch, { "bell-pitch", "x11.bell-pitch", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_bit_gravity, { "bit-gravity", "x11.bit-gravity", FT_UINT8, BASE_DEC, VALS(gravity_vals), 0, NULL, HFILL }}, +{ &hf_x11_bit_gravity, { "bit-gravity", "x11.bit-gravity", FT_UINT8, BASE_DEC, VALS(bit_gravity_vals), 0, NULL, HFILL }}, { &hf_x11_bit_plane, { "bit-plane", "x11.bit-plane", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_blue, { "blue", "x11.blue", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_blues, { "blues", "x11.blues", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, @@ -493,7 +493,7 @@ { &hf_x11_warp_pointer_src_window, { "warp-pointer-src-window", "x11.warp-pointer-src-window", FT_UINT32, BASE_HEX, VALS(zero_is_none_vals), 0, NULL, HFILL }}, { &hf_x11_wid, { "wid", "x11.wid", FT_UINT32, BASE_HEX, NULL, 0, "Window id", HFILL }}, { &hf_x11_width, { "width", "x11.width", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, -{ &hf_x11_win_gravity, { "win-gravity", "x11.win-gravity", FT_UINT8, BASE_DEC, VALS(gravity_vals), 0, NULL, HFILL }}, +{ &hf_x11_win_gravity, { "win-gravity", "x11.win-gravity", FT_UINT8, BASE_DEC, VALS(win_gravity_vals), 0, NULL, HFILL }}, { &hf_x11_win_x, { "win-x", "x11.win-x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_win_y, { "win-y", "x11.win-y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_window, { "window", "x11.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, |