osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix checkAPIs: don't try to feed VALS() into FT_BOOLEANs. 

Also, as per Peter Harris' request, update copyright date.

svn path=/trunk/; revision=53545
This commit is contained in:
Jeff Morriss 2013-11-24 14:27:52 +00:00
parent 6aec20c782
commit a98072967e
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/x11-enum.h
View File

@ -4,7 +4,7 @@
/* $Id$ */
/*
* Copyright 2008, 2009 Open Text Corporation <pharris[AT]opentext.com>
* Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald[AT]wireshark.org>

2
epan/dissectors/x11-extension-errors.h
View File

@ -4,7 +4,7 @@
/* $Id$ */
/*
* Copyright 2008, 2009 Open Text Corporation <pharris[AT]opentext.com>
* Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald[AT]wireshark.org>

2
epan/dissectors/x11-extension-implementation.h
View File

@ -4,7 +4,7 @@
/* $Id$ */
/*
* Copyright 2008, 2009 Open Text Corporation <pharris[AT]opentext.com>
* Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald[AT]wireshark.org>

2
epan/dissectors/x11-glx-render-enum.h
View File

@ -4,7 +4,7 @@
/* $Id$ */
/*
* Copyright 2008, 2009 Open Text Corporation <pharris[AT]opentext.com>
* Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald[AT]wireshark.org>

4
epan/dissectors/x11-register-info.h
View File

@ -4429,7 +4429,7 @@
{ &hf_x11_xinput_XIGrabDevice_deviceid, { "deviceid", "x11.xinput.XIGrabDevice.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }},
{ &hf_x11_xinput_XIGrabDevice_mode, { "mode", "x11.xinput.XIGrabDevice.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_GrabMode), 0, NULL, HFILL }},
{ &hf_x11_xinput_XIGrabDevice_paired_device_mode, { "paired_device_mode", "x11.xinput.XIGrabDevice.paired_device_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_GrabMode), 0, NULL, HFILL }},
{ &hf_x11_xinput_XIGrabDevice_owner_events, { "owner_events", "x11.xinput.XIGrabDevice.owner_events", FT_BOOLEAN, BASE_DEC, VALS(x11_enum_xinput_GrabOwner), 0, NULL, HFILL }},
{ &hf_x11_xinput_XIGrabDevice_owner_events, { "owner_events", "x11.xinput.XIGrabDevice.owner_events", FT_UINT8, BASE_DEC, VALS(x11_enum_xinput_GrabOwner), 0, NULL, HFILL }},
{ &hf_x11_xinput_XIGrabDevice_mask_len, { "mask_len", "x11.xinput.XIGrabDevice.mask_len", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xinput_XIGrabDevice_mask, { "mask", "x11.xinput.XIGrabDevice.mask", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_x11_xinput_XIGrabDevice_mask_item, { "mask", "x11.xinput.XIGrabDevice.mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@ -4454,7 +4454,7 @@
{ &hf_x11_xinput_XIPassiveGrabDevice_grab_type, { "grab_type", "x11.xinput.XIPassiveGrabDevice.grab_type", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_GrabType), 0, NULL, HFILL }},
{ &hf_x11_xinput_XIPassiveGrabDevice_grab_mode, { "grab_mode", "x11.xinput.XIPassiveGrabDevice.grab_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_GrabMode22), 0, NULL, HFILL }},
{ &hf_x11_xinput_XIPassiveGrabDevice_paired_device_mode, { "paired_device_mode", "x11.xinput.XIPassiveGrabDevice.paired_device_mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xproto_GrabMode), 0, NULL, HFILL }},
{ &hf_x11_xinput_XIPassiveGrabDevice_owner_events, { "owner_events", "x11.xinput.XIPassiveGrabDevice.owner_events", FT_BOOLEAN, BASE_DEC, VALS(x11_enum_xinput_GrabOwner), 0, NULL, HFILL }},
{ &hf_x11_xinput_XIPassiveGrabDevice_owner_events, { "owner_events", "x11.xinput.XIPassiveGrabDevice.owner_events", FT_UINT8, BASE_DEC, VALS(x11_enum_xinput_GrabOwner), 0, NULL, HFILL }},
{ &hf_x11_xinput_XIPassiveGrabDevice_mask, { "mask", "x11.xinput.XIPassiveGrabDevice.mask", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_x11_xinput_XIPassiveGrabDevice_mask_item, { "mask", "x11.xinput.XIPassiveGrabDevice.mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_xinput_XIPassiveGrabDevice_modifiers, { "modifiers", "x11.xinput.XIPassiveGrabDevice.modifiers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},

7
tools/process-x11-xcb.pl
View File

@ -4,7 +4,7 @@
# X11 dissector. Creates header files containing code to
# dissect X11 extensions.
#
# Copyright 2008, 2009 Open Text Corporation <pharris[AT]opentext.com>
# Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
#
# $Id$
#
@ -595,8 +595,9 @@ sub register_element($$$$;$)
my $enumname = dump_enum_values($enum_name{$enum});
$vals = "VALS($enumname)";
# Wireshark does not allow FT_BYTES or BASE_NONE to have an enum
# Wireshark does not allow FT_BYTES, FT_BOOLEAN, or BASE_NONE to have an enum
$ft =~ s/FT_BYTES/FT_UINT8/;
$ft =~ s/FT_BOOLEAN/FT_UINT8/;
$base =~ s/BASE_NONE/BASE_DEC/;
}
@ -1572,7 +1573,7 @@ eot
# Add license text
print $out <<eot
/*
* Copyright 2008, 2009 Open Text Corporation <pharris[AT]opentext.com>
* Copyright 2008, 2009, 2013 Open Text Corporation <pharris[AT]opentext.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald[AT]wireshark.org>