diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-12-13 05:56:42 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-04-16 18:55:10 +0000 |
| commit | b1a41acb52a2db6f4661d741badc44709d3078ec (patch) | |
| tree | b2ebcae2aa2793ab6af8da1f03161c862e9721b4 /tools | |
| parent | 4fa9c5f1f34885181339c7e2fa6f97a57569b413 (diff) | |
X11: Resolve filter differences between a "list" and its "item".
The "list" is of type FT_NONE and the "item" is not. That can
cause type conflicts.
Change-Id: If62f7113bc120e392588724a0dd65b7ab32ccde7
Reviewed-on: https://code.wireshark.org/review/21146
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/process-x11-xcb.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/process-x11-xcb.pl b/tools/process-x11-xcb.pl index 6b322022e1..6631380e8e 100755 --- a/tools/process-x11-xcb.pl +++ b/tools/process-x11-xcb.pl @@ -345,7 +345,7 @@ eot } else { print $decl "static int $regname = -1;\n"; if ($list and $info->{'size'} > 1) { - print $reg "{ &$regname, { \"$fieldname\", \"x11.glx.render.$name.$fieldname\", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},\n"; + print $reg "{ &$regname, { \"$fieldname\", \"x11.glx.render.$name.$fieldname.list\", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},\n"; $regname .= '_item'; print $decl "static int $regname = -1;\n"; } @@ -732,7 +732,7 @@ sub register_element($$$$;$) print $decl "static int $regname = -1;\n"; if ($e->name() eq 'list' and defined $info->{'size'} and $info->{'size'} > 1) { - print $reg "{ &$regname, { \"$fieldname\", \"$humanname\", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},\n"; + print $reg "{ &$regname, { \"$fieldname\", \"$humanname.list\", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},\n"; $regname .= '_item'; print $decl "static int $regname = -1;\n"; } |