aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2013-11-24 14:27:52 +0000
committerJeff Morriss <jeff.morriss.ws@gmail.com>2013-11-24 14:27:52 +0000
commita98072967ec61c5026e7cac5cb2138be048c0625 (patch)
tree4c625c5a1ff42af18e757ee05ca5f65237df68fb /epan/dissectors
parent6aec20c782cddca17ad922314d2ca0451e9f351a (diff)
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
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/x11-enum.h2
-rw-r--r--epan/dissectors/x11-extension-errors.h2
-rw-r--r--epan/dissectors/x11-extension-implementation.h2
-rw-r--r--epan/dissectors/x11-glx-render-enum.h2
-rw-r--r--epan/dissectors/x11-register-info.h4
5 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/x11-enum.h b/epan/dissectors/x11-enum.h
index 4079c2a53c..5bf5575ae3 100644
--- a/epan/dissectors/x11-enum.h
+++ b/epan/dissectors/x11-enum.h
@@ -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>
diff --git a/epan/dissectors/x11-extension-errors.h b/epan/dissectors/x11-extension-errors.h
index 8555e7e60f..69a596fef2 100644
--- a/epan/dissectors/x11-extension-errors.h
+++ b/epan/dissectors/x11-extension-errors.h
@@ -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>
diff --git a/epan/dissectors/x11-extension-implementation.h b/epan/dissectors/x11-extension-implementation.h
index bfa7b1ada3..074146d65c 100644
--- a/epan/dissectors/x11-extension-implementation.h
+++ b/epan/dissectors/x11-extension-implementation.h
@@ -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>
diff --git a/epan/dissectors/x11-glx-render-enum.h b/epan/dissectors/x11-glx-render-enum.h
index b5990d1556..d6bc4a0b6f 100644
--- a/epan/dissectors/x11-glx-render-enum.h
+++ b/epan/dissectors/x11-glx-render-enum.h
@@ -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>
diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h
index cfee15fe25..20cf6cdd2a 100644
--- a/epan/dissectors/x11-register-info.h
+++ b/epan/dissectors/x11-register-info.h
@@ -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 }},