From a98072967ec61c5026e7cac5cb2138be048c0625 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Sun, 24 Nov 2013 14:27:52 +0000 Subject: [PATCH] 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 --- epan/dissectors/x11-enum.h | 2 +- epan/dissectors/x11-extension-errors.h | 2 +- epan/dissectors/x11-extension-implementation.h | 2 +- epan/dissectors/x11-glx-render-enum.h | 2 +- epan/dissectors/x11-register-info.h | 4 ++-- tools/process-x11-xcb.pl | 7 ++++--- 6 files changed, 10 insertions(+), 9 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 + * Copyright 2008, 2009, 2013 Open Text Corporation * * Wireshark - Network traffic analyzer * By Gerald Combs 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 + * Copyright 2008, 2009, 2013 Open Text Corporation * * Wireshark - Network traffic analyzer * By Gerald Combs 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 + * Copyright 2008, 2009, 2013 Open Text Corporation * * Wireshark - Network traffic analyzer * By Gerald Combs 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 + * Copyright 2008, 2009, 2013 Open Text Corporation * * Wireshark - Network traffic analyzer * By Gerald Combs 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 }}, diff --git a/tools/process-x11-xcb.pl b/tools/process-x11-xcb.pl index 8b409f0103..7761d87904 100755 --- a/tools/process-x11-xcb.pl +++ b/tools/process-x11-xcb.pl @@ -4,7 +4,7 @@ # X11 dissector. Creates header files containing code to # dissect X11 extensions. # -# Copyright 2008, 2009 Open Text Corporation +# Copyright 2008, 2009, 2013 Open Text Corporation # # $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 < + * Copyright 2008, 2009, 2013 Open Text Corporation * * Wireshark - Network traffic analyzer * By Gerald Combs