ChangeLog | 2307 ++++++++++++++++++++++++++++++++ Xext/saver.c | 3 Xext/security.c | 13 Xext/shm.c | 2 Xext/sync.c | 4 Xext/syncsrv.h | 4 Xext/xres.c | 4 Xext/xselinux_hooks.c | 4 Xext/xtest.c | 9 Xext/xvdisp.c | 4 Xext/xvmc.c | 6 Xi/exevents.c | 262 ++- Xi/extinit.c | 8 Xi/grabdev.c | 2 Xi/grabdevb.c | 4 Xi/grabdevk.c | 4 Xi/ungrdev.c | 2 Xi/ungrdevb.c | 32 Xi/ungrdevk.c | 31 Xi/xichangehierarchy.c | 15 Xi/xigrabdev.c | 19 Xi/xipassivegrab.c | 92 - Xi/xiproperty.c | 4 Xi/xiselectev.c | 5 config/hal.c | 1 configure.ac | 69 debian/changelog | 6 dix/atom.c | 7 dix/cursor.c | 2 dix/devices.c | 6 dix/dispatch.c | 28 dix/dixutils.c | 4 dix/eventconvert.c | 16 dix/events.c | 1085 ++++++++------- dix/extension.c | 25 dix/getevents.c | 38 dix/grabs.c | 166 +- dix/inpututils.c | 241 +++ dix/registry.c | 5 dix/resource.c | 2 dix/tables.c | 2 doc/Xinput.xml | 2 doc/Xserver-spec.xml | 4 doc/dtrace/Xserver-DTrace.xml | 2 exa/exa_render.c | 6 glx/glxdri.c | 15 glx/glxdri2.c | 14 glx/glxdriswrast.c | 14 glx/glxscreens.c | 10 glx/single2.c | 4 hw/dmx/config/Makefile.am | 1 hw/dmx/config/dmxcompat.c | 4 hw/dmx/config/scanner.l | 3 hw/dmx/dmxinit.c | 13 hw/dmx/doc/dmx.xml | 2 hw/dmx/doc/scaled.xml | 2 hw/dmx/examples/ev.c | 4 hw/dmx/glxProxy/Makefile.am | 2 hw/dmx/glxProxy/compsize.c | 1 hw/dmx/glxProxy/compsize.h | 51 hw/dmx/glxProxy/g_renderswap.c | 1 hw/dmx/glxProxy/glxcmds.c | 2 hw/dmx/glxProxy/glxcmds.h | 37 hw/dmx/glxProxy/glxcmdsswap.c | 3 hw/dmx/glxProxy/glxscreens.c | 5 hw/kdrive/ephyr/ephyrhostvideo.c | 9 hw/kdrive/ephyr/hostx.c | 5 hw/kdrive/linux/linux.c | 2 hw/kdrive/src/kdrive.c | 15 hw/kdrive/src/kdrive.h | 8 hw/kdrive/src/kinput.c | 10 hw/vfb/InitOutput.c | 33 hw/xfree86/common/Makefile.am | 2 hw/xfree86/common/xf86.h | 3 hw/xfree86/common/xf86AutoConfig.c | 2 hw/xfree86/common/xf86Config.c | 56 hw/xfree86/common/xf86Config.h | 2 hw/xfree86/common/xf86Configure.c | 72 hw/xfree86/common/xf86DGA.c | 4 hw/xfree86/common/xf86Globals.c | 2 hw/xfree86/common/xf86Helper.c | 11 hw/xfree86/common/xf86Init.c | 78 - hw/xfree86/common/xf86Mode.c | 4 hw/xfree86/common/xf86Module.h | 2 hw/xfree86/common/xf86Opt.h | 4 hw/xfree86/common/xf86Option.c | 12 hw/xfree86/common/xf86PM.c | 4 hw/xfree86/common/xf86Priv.h | 9 hw/xfree86/common/xf86ShowOpts.c | 130 - hw/xfree86/common/xf86Xinput.c | 5 hw/xfree86/common/xf86Xinput.h | 2 hw/xfree86/common/xf86pciBus.c | 30 hw/xfree86/common/xf86sbusBus.c | 2 hw/xfree86/ddc/xf86DDC.h | 5 hw/xfree86/doc/ddxDesign.xml | 4 hw/xfree86/fbdevhw/fbdevhw.c | 26 hw/xfree86/i2c/msp3430.c | 5 hw/xfree86/loader/loadmod.c | 13 hw/xfree86/modes/xf86Crtc.c | 8 hw/xfree86/modes/xf86Crtc.h | 2 hw/xfree86/modes/xf86EdidModes.c | 2 hw/xfree86/modes/xf86Modes.c | 4 hw/xfree86/modes/xf86Modes.h | 4 hw/xfree86/os-support/bsd/bsd_init.c | 10 hw/xfree86/os-support/bus/Sbus.c | 12 hw/xfree86/os-support/linux/lnx_init.c | 2 hw/xfree86/os-support/solaris/sun_agp.c | 2 hw/xfree86/parser/Configint.h | 4 hw/xfree86/parser/DRI.c | 4 hw/xfree86/parser/Device.c | 4 hw/xfree86/parser/Extensions.c | 2 hw/xfree86/parser/Files.c | 2 hw/xfree86/parser/Flags.c | 6 hw/xfree86/parser/Input.c | 4 hw/xfree86/parser/InputClass.c | 19 hw/xfree86/parser/Layout.c | 28 hw/xfree86/parser/Module.c | 4 hw/xfree86/parser/Monitor.c | 84 - hw/xfree86/parser/Pointer.c | 8 hw/xfree86/parser/Screen.c | 36 hw/xfree86/parser/Vendor.c | 6 hw/xfree86/parser/Video.c | 6 hw/xfree86/parser/configProcs.h | 6 hw/xfree86/parser/scan.c | 56 hw/xfree86/parser/xf86Optrec.h | 2 hw/xfree86/parser/xf86Parser.h | 10 hw/xfree86/ramdac/BTPriv.h | 2 hw/xfree86/ramdac/IBMPriv.h | 2 hw/xfree86/ramdac/TIPriv.h | 2 hw/xfree86/utils/gtf/gtf.c | 4 hw/xfree86/vbe/vbe.c | 2 hw/xfree86/x86emu/debug.c | 6 hw/xfree86/x86emu/fpu.c | 16 hw/xfree86/x86emu/ops2.c | 4 hw/xfree86/x86emu/x86emu/debug.h | 4 hw/xfree86/xaa/xaaGC.c | 1 hw/xfree86/xaa/xaaTables.c | 3 hw/xfree86/xaa/xaalocal.h | 4 hw/xnest/Display.c | 5 hw/xquartz/xpr/dri.c | 3 hw/xwin/win.h | 4 hw/xwin/winconfig.c | 4 include/dix-config.h.in | 86 - include/dix.h | 12 include/dixgrabs.h | 8 include/dixstruct.h | 1 include/eventconvert.h | 7 include/exevents.h | 8 include/extension.h | 6 include/extinit.h | 2 include/extnsionst.h | 4 include/input.h | 27 include/inputstr.h | 34 include/inpututils.h | 18 include/list.h | 81 - include/misc.h | 18 include/os.h | 24 include/registry.h | 2 include/resource.h | 2 include/xkb-config.h.in | 3 include/xkbfile.h | 4 include/xkbsrv.h | 4 include/xorg-config.h.in | 6 include/xorg-server.h.in | 21 include/xwin-config.h.in | 3 mi/mibitblt.c | 2 mi/miinitext.c | 6 os/Makefile.am | 12 os/access.c | 68 os/auth.c | 6 os/client.c | 8 os/connection.c | 25 os/io.c | 2 os/log.c | 2 os/mitauth.c | 2 os/osdep.h | 8 os/osinit.c | 4 os/rpcauth.c | 9 os/strcasecmp.c | 4 os/strcasestr.c | 2 os/strlcpy.c | 2 os/strndup.c | 49 os/utils.c | 18 os/xdmauth.c | 4 os/xdmcp.c | 10 randr/randrstr.h | 5 randr/rrinfo.c | 2 record/record.c | 8 render/filter.c | 9 render/glyphstr.h | 3 render/picturestr.h | 6 render/render.c | 4 test/.gitignore | 8 test/Makefile.am | 31 test/input.c | 197 +- test/list.c | 37 test/misc.c | 3 test/string.c | 69 test/xi2/Makefile.am | 15 test/xi2/protocol-eventconvert.c | 6 test/xi2/protocol-xipassivegrabdevice.c | 4 test/xi2/xi2.c | 129 + xfixes/cursor.c | 4 xkb/ddxList.c | 2 xkb/ddxLoad.c | 6 xkb/maprules.c | 5 xkb/xkbActions.c | 9 xkb/xkbInit.c | 25 xkb/xkbLEDs.c | 6 xkb/xkbfmisc.c | 2 xkb/xkbout.c | 6 xkb/xkbtext.c | 189 +- 212 files changed, 5238 insertions(+), 1895 deletions(-)
New commits: commit 52f2f0f08bc26588745d22b6d3520789e8b87a18 Author: Cyril Brulebois <k...@debian.org> Date: Tue Dec 20 00:37:44 2011 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index d8eb167..b836b0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,2291 @@ +commit c065f7b16329e30cb976359e0a807c2adaf50123 +Author: Keith Packard <kei...@keithp.com> +Date: Sat Dec 17 17:22:45 2011 -0800 + + Version 1.11.99.2 (1.12 snapshot 2) + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit ead968a4300c0adeff89b9886e888b6d284c75cc +Author: Antoine Martin <anto...@nagafix.co.uk> +Date: Sat Dec 17 01:36:51 2011 +0700 + + xserver: check for elevated privileges not uid=0 + + This allows us to run the server as a normal user whilst still + being able to use the -modulepath, -logfile and -config switches + We define a xf86PrivsElevated which will do the checks and cache + the result in case it is called more than once. + Also renamed the paths #defines to match their new meaning. + Original discussion which led to this patch can be found here: + http://lists.freedesktop.org/archives/xorg-devel/2011-September/025853.html + + Signed-off-by: Antoine Martin <anto...@nagafix.co.uk> + Tested-by: Michal Suchanek <hramrach at centrum.cz> + Reviewed-by: Jamey Sharp <jamey at minilop.net> + Reviewed-by: Adam Jackson <a...@redhat.com> + +commit 2c1d0a539c0fb1860ac89a00d1fb609f1959e1b6 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Fri Dec 9 07:45:02 2011 -0500 + + dmx: fix distcheck failure, missing compsize.h in Makefile.am + + which was added in commit: + dmx: Build fix for -Werror=implicit-function-declaration + + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit f7ea7a324520844beaac8be7503ac50e20da5ab1 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Dec 14 10:34:19 2011 +1000 + + configure: split the required modules up + + We do the same thing for libraries and optional modules already, and it's + much easier to read when one of them changes + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Gaetan Nadon <mems...@videotron.ca> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 7da7aa96a0acb895e1fe57a9d3f2d093479cf2a2 +Merge: b79de3f 7528a6b +Author: Keith Packard <kei...@keithp.com> +Date: Wed Dec 14 11:40:10 2011 -0800 + + Merge remote-tracking branch 'whot/for-keith' + +commit 7528a6b88eb32098af4369a8bd9d70a808fa6f1c +Merge: f0de5e3 898d976 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Dec 13 14:19:54 2011 +1000 + + Merge branch 'for-whot' of git://people.freedesktop.org/~alanc/xserver into for-keith + +commit f0de5e3990b70df9899b7dd17d7ee6ff7c768183 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Sun Dec 11 07:31:43 2011 +1000 + + dix: add a MAXEVENTS define for the number of core + extension events + + Not including GenericEvents + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Walter Harms <wha...@bfs.de> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit adf8a0d62c0643f4c44a3b6d2e3c6c9b02532915 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Dec 9 18:38:53 2011 +1000 + + dix: move event filter retrieval helpers to inpututils.c + + No functional changes + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit a03fe819506fbcbfcb299d4919d16061603fd4ec +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Dec 9 18:02:49 2011 +1000 + + dix: switch EventIsDeliverable to take the event type only + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit 10a8c428fac0d4ff8f8a3e3487c13dd349d27ed7 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Fri Dec 9 15:49:04 2011 +1000 + + dix: move storing last.valuators into a helper function + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit a15abf82ddb5a209dbc30c4d12e1dc23c4adf3e4 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Dec 8 15:38:44 2011 +1000 + + dix: always allocate and set the grab's sync.event + + Allocate the memory at device creation time and always store the event, even + if we're not frozen. This way we know which event triggered the grab. + Since the event was never freed anyway except on device shutdown, this + doesn't really change things much. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit 218752bdc5d9323d1e6202e762573a925cf8a4eb +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Dec 8 14:27:01 2011 +1000 + + input: replace GRABTYPE_* with the InputLevel enums + + They achieve the same thing, re-use the more generic InputLevel so we can + convert to/fro easier. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit cd56bd7b3ee34a4b10eb3a57a6e94cac7512167a +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Dec 8 14:59:06 2011 +1000 + + Add GrabIsPointerGrab and GrabIsKeyboardGrab helpers + + No functional changes + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit 47734b2ba2e1f9246fd1a3b7059ca60b0e15acb2 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Dec 8 12:00:34 2011 +1000 + + dix: move delivery stop condition out of event mask + + Previously, this was only called if there was a mask match, so even if we + had a no-propagate flag set or a stopAt window specified, if no mask + triggered on the window we would recurse up to the root window and + eventually deliver. + Move this, so that the stopAt and do-not-propagate mask is honoured. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit 1d01e861b69d7ca8fe2335270b8286bc115fb6e9 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Dec 8 10:22:26 2011 +1000 + + dix: split out core state and event state setting into helper functions + + no functional changes. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit fb010c543696b781a83b945f72865b7d7b75bf95 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Dec 7 14:41:18 2011 +1000 + + dix: move grab matching code into a helper function + + No functional changes. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit d253a262c2c690357a4db7e235c48ab5dd0b77f8 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Dec 7 13:57:25 2011 +1000 + + dix: split core grab interference check into helper function + + No functional changes. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit 97d79dd740ed1ac4eb02b0d4135850f953716278 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Dec 7 13:54:28 2011 +1000 + + dix: compare the grab type, not the tempGrab type + + No functional change. To get here, GrabMatchesSecond() needs to be TRUE and + for that the two grab types must be identical. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit b9d6ae42b686287d7d23c2eefe2b12da98fe6ff8 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Dec 7 15:43:31 2011 +1000 + + dix: remove event type check + + Can't remember why this is there but we'll need to pass in XI2 events soon, + so this check is obsolete. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit 80816366aa77f1730a1b6ddabfa55a946d76d494 +Author: Chase Douglas <chase.doug...@canonical.com> +Date: Fri Nov 25 13:57:03 2011 -0800 + + dix: Split ActivatePassiveGrab() from CheckPassiveGrab() + + The changed logic means we don't require the explicit grab = NULL setting + and early exit anymore. Not 100% of it, but if we see that message pop up in + a log we know it's broken. + + Signed-off-by: Chase Douglas <chase.doug...@canonical.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 9ee62cd8ce3c3effc3663f3d56b322385ce12fdb +Author: Chase Douglas <chase.doug...@canonical.com> +Date: Thu Nov 17 17:40:24 2011 -0800 + + dix: Move grab check and activation logic to CheckPassiveGrab() + + This is needed for future pointer emulation work. + + Signed-off-by: Chase Douglas <chase.doug...@canonical.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit c53651dabc66aeb9882819a404a799a364f00a29 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Dec 6 12:57:38 2011 +1000 + + dix: move EventDeliveryState into a header file, we'll need it elsewhere + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit 86c3137c81e924bacd919e9d65809e07afeabbff +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Dec 6 12:04:11 2011 +1000 + + Xi: split updating button count and state into helper functions + + Functional change: for a button mapped to 0, the motionHintWindow is not + updated to the NullWindow anymore. Before it got updated unconditionally to + the button mapping. I have no idea what the practical effect of this is, but + I guess it's closer to the correct behaviour: pressing a button that's + logically disabled now does not disrupt the motion hint delivery. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit e0f37250ffff5dcb3bc0e8cad63439995ce01a20 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Dec 6 11:40:33 2011 +1000 + + Xi: deduplicate button motion mask setting + + No functional changes + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit 6eff14a789341d366b3013c5aa020e959c954651 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Dec 5 18:54:30 2011 +1000 + + dix: deduplicate callers of DeliverDeviceEvents in DeliverGrabbedEvents + + No functional change. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit 93945b0a74aa8156a88f52b8ba77f1210042f396 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Dec 5 18:42:05 2011 +1000 + + dix: split grab event conversion and delivery into a helper function + + Effective functional change: XI2 events are checked with XACE now. + + DeliverOneGrabbedEvent is exported for future use by touch events. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit c81cdb0862e2184f033b3933e6bacbe0809ef2c0 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Dec 5 18:29:27 2011 +1000 + + dix: replace conversion errors with BUG_WARN_MSG + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit 6368c2aa4613a7c7eb0e8afca8d41f1a9bc4fc4d +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Dec 5 16:46:18 2011 +1000 + + dix: deduplicate event delivery code + + Move all the event delivery code into DeliverOneEvent, based on the + InputLevel we're sending to. + + Functional change: we now check XI2 events with XACE too. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit 7e2207548b3173afc9accb5ccd532c181a7b94ed +Author: Chase Douglas <chase.doug...@canonical.com> +Date: Wed Dec 7 20:32:28 2011 +1000 + + include: Add an InputLevel enum + + Currently unused, but will be in the future. + + Signed-off-by: Chase Douglas <chase.doug...@canonical.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 898d97672907a8074031d0d1038cd44bb5caf40d +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:33 2011 -0800 + + verify_internal_event: preserve constness of data pointer + + All we're using it for is ErrorF calls, so make it a const char * + to stop gcc from warning: + + inpututils.c: In function 'verify_internal_event': + inpututils.c:629:9: warning: cast discards qualifiers from pointer target type + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 79d09647d878e66721a778979a9eb1f4bba5f8d6 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:33 2011 -0800 + + Use const cast in BitIsOn macro to avoid angering gcc + + Fixes gcc warnings such as: + inpututils.c: In function 'valuator_mask_isset': + inpututils.c:498:5: warning: cast discards qualifiers from pointer target type + inpututils.c: In function 'CountBits': + inpututils.c:613:9: warning: cast discards qualifiers from pointer target type + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 99dfe9b1de09cb481e95bd4c45dcf7493480798b +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:32 2011 -0800 + + Fix deconstifying cast warning in xi2_get_type + + Since we're just comparing values in the struct, cast it to a + const xGenericEvent * to clear gcc warning of: + + events.c: In function 'xi2_get_type': + events.c:193:5: warning: cast discards qualifiers from pointer target type + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit dd80156bf05c9eb4000d0981e00d0d9fb69a94f6 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Wed Dec 7 22:58:45 2011 -0800 + + Include client name if available in PrintDeviceGrabInfo + + Also adds missing newline to first line of output. + + Before patch: + + [3581472.414] (II) Printing all currently active device grabs: + [3581472.414] Active grab 0x1800000 (core) on device 'Virtual core pointer' (2): + client pid 26174 uid 0 gid 10 + [3581472.415] at 3581469139 (from active grab) (device thawed, state 1) + [3581472.415] core event mask 0x0 + [3581472.415] owner-events true, kb 1 ptr 1, confine 0, cursor 0x0 + [3581472.415] Active grab 0x1800000 (core) on device 'Virtual core keyboard' (3) + : client pid 26174 uid 0 gid 10 + [3581472.415] at 3581469139 (from active grab) (device thawed, state 1) + [3581472.415] core event mask 0x3 + [3581472.415] owner-events true, kb 1 ptr 1, confine 0, cursor 0x0 + [3581472.415] (II) End list of active device grabs + + After patch: + [3581736.601] (II) Printing all currently active device grabs: + [3581736.601] Active grab 0x1600000 (core) on device 'Virtual core pointer' (2): + [3581736.601] client pid 26741 /usr/bin/xscreensaver -nosplash + [3581736.601] at 3581735000 (from active grab) (device thawed, state 1) + [3581736.601] core event mask 0x0 + [3581736.601] owner-events true, kb 1 ptr 1, confine 0, cursor 0x0 + [3581736.601] Active grab 0x1600000 (core) on device 'Virtual core keyboard' (3) + : + [3581736.601] client pid 26741 /usr/bin/xscreensaver -nosplash + [3581736.601] at 3581735000 (from active grab) (device thawed, state 1) + [3581736.601] core event mask 0x3 + [3581736.601] owner-events true, kb 1 ptr 1, confine 0, cursor 0x0 + [3581736.601] (II) End list of active device grabs + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Rami Ylimäki <rami.ylim...@vincit.fi> + +commit b79de3f42ff8412dcabf2f2a805cbcbd1c6907c3 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:35 2011 -0800 + + xf86 parser: convert Error to a varargs macro to clear gcc format warnings + + Previously it always passed a format string with exactly one argument, + using NULL when the format string needed none. Now pass the right number + of arguments to clear gcc warnings of 'too many arguments for format'. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 7801b3dcd6501e3de93a6d2cee93b2593806e922 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:35 2011 -0800 + + Add some printf format attributes suggested by gcc + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit f68df9dfd2c7ca03c24aaa0a895b7191ecb81e85 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:34 2011 -0800 + + xf86Priv.h: Add some noreturn attributes suggested by gcc + + Both functions call exit() at the end and have no other return path. + Also correct comment/heading to reflect commit 6450f6ca7ee0 moving + DoShowOptions into xf86Configure.c. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 3823eedf3c124d3a20360480ba349bea72de3069 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:34 2011 -0800 + + Remove duplicate declarations of KdAdd*Driver in kdrive.h + + Clears gcc warnings in every file that includes kdrive.h: + kdrive.h:507:1: warning: redundant redeclaration of 'KdAddPointerDriver' + kdrive.h:225:6: note: previous declaration of 'KdAddPointerDriver' was here + kdrive.h:510:1: warning: redundant redeclaration of 'KdAddKeyboardDriver' + kdrive.h:284:6: note: previous declaration of 'KdAddKeyboardDriver' was here + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 471e5373b6f87336dac3b9de9b3852f63a2b10dc +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:34 2011 -0800 + + Remove duplicate declaration of xf86ValidateModesFlags in xf86Modes.h + + Clears gcc warning in every file that includes xf86Modes.h: + xf86Modes.h:102:1: warning: redundant redeclaration of 'xf86ValidateModesFlags' + xf86Modes.h:72:1: note: previous declaration of 'xf86ValidateModesFlags' was here + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 41dd7cf673e47ab74c5065b8dbf268b2e5facb64 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:34 2011 -0800 + + _XkbFilterDeviceBtn: move variable declarations to match usage scope + + The main body of this function is an if { } else if { } pair of blocks. + Previously there was int button at the top level scope which is used + only in the first block, and a redeclaration of int button inside the + second block. Since there's no overlap in the code paths for the + two uses of button, move the one from the outer block into the first + block to help the programmer more quickly determine they are unrelated + usages, and to silence the gcc warning of: + + xkbActions.c: In function '_XkbFilterDeviceBtn': + xkbActions.c:999:6: warning: declaration of 'button' shadows a previous local + xkbActions.c:955:6: warning: shadowed declaration is here + + For consistency, move DeviceIntPtr dev declarations as well that are + used in the same way. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit d8eb9b5faa2d2c9350bdaffef8749a9cac3c87b8 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:34 2011 -0800 + + XkbFindSrvLedInfo: remove extraneous name-clashing sli variable + + Variable is already defined outside the outer if statement, and + there's no need to redefine inside the if statement. + + No point in setting sli before if (dev->kbdfeed->xkb_sli==NULL) + check - if check is true, we immediately set it, if check is false, + we immediately return without further reference or use of it. + + The one thing we do with it inside the inner if statement is store + an allocation in it for a brief moment before writing to the final + destination, which is immediately returned to the caller. + + In short, there's no benefit to the variable at all in this block, + it just gives the optimizer more code to figure out how to omit. + + Fixes gcc warning: + xkbLEDs.c: In function 'XkbFindSrvLedInfo': + xkbLEDs.c:683:19: warning: declaration of 'sli' shadows a previous local + xkbLEDs.c:679:18: warning: shadowed declaration is here + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 9edfa47bd58cd318d57d0f114714fd146be35a79 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:34 2011 -0800 + + KdParseFindNext: Constify delim argument + + It's only used as input to strchr to find the delimiters, never + written to. + + Clears a bunch of gcc warnings of the form: + kdrive.c:323:2: warning: passing argument 2 of 'KdParseFindNext' discards qualifiers from pointer target type + kdrive.c:261:1: note: expected 'char *' but argument is of type 'const char *' + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit ff64ad6c74a3e14ca34bacb8866bdbd2262bddff +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:34 2011 -0800 + + Convert KdDoSwitchCmd to use asprintf instead of malloc/strcat/etc. + + Also fix the reason argument to be const char * to clear several gcc + warnings of: + kdrive.c:151:2: warning: passing argument 1 of 'KdDoSwitchCmd' discards qualifiers from pointer target type + kdrive.c:116:1: note: expected 'char *' but argument is of type 'const char *' + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 5bc590bde23ce1c57015b1d9e1cc63189c37448e +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:34 2011 -0800 + + DoShowOptions: preserve constness of options list as we walk it + + Since all we do with the option list is walk down the list printing + the names, there's no need to cast away its constness. + + Clears gcc warning: + xf86Configure.c: In function 'DoShowOptions': + xf86Configure.c:781:4: warning: cast discards qualifiers from pointer target type + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 71efd868282d47a6db405a16de18ac322926962b +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:34 2011 -0800 + + x86emu: constify debug strings + + Strings are all pointers to literal constants, just used as input + to printf calls when debugging is enabled. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit d5a5eece670dee963765eab1431c21525c16d9ee +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:34 2011 -0800 + + CompareISOLatin1Lowered: constify arguments + + Allows callers to avoid deconstifying arguments when calling, fixing + gcc warning: + + filter.c: In function 'PictureGetFilterId': + filter.c:59:2: warning: cast discards qualifiers from pointer target type + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 83ac9502ea9f1dedf3a8002745668af16bb1f2af +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:33 2011 -0800 + + xdmcp.c: fix three small const warnings + + xdmcp.c:63:36: warning: initialization discards qualifiers from pointer target type + + xdmcp.c: In function 'XdmcpRegisterConnection': + xdmcp.c:482:8: warning: cast discards qualifiers from pointer target type + xdmcp.c:482:8: warning: cast discards qualifiers from pointer target type + xdmcp.c:482:8: warning: cast discards qualifiers from pointer target type + + xdmcp.c: In function 'get_mcast_options': + xdmcp.c:1596:21: warning: initialization discards qualifiers from pointer target type + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 3839d1480877818f3ccc04e25237d853bab210c3 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:33 2011 -0800 + + LockServer: store path to LOCKDIR literal string in a const char * + + And instead of initializing to NULL, then resetting to LOCKDIR almost + immediately (before ever using the NULL value), skip directly to setting + it to LOCKDIR. + + tmppath variable is only used as input for generating the path name + via calls to strlen, sprintf, etc. + + Fixes gcc warning of: + utils.c: In function 'LockServer': + utils.c:259:11: warning: assignment discards qualifiers from pointer target type + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit af4113bfeb1d155f5f037c3492e50513336fa4a7 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:33 2011 -0800 + + WriteToClient: preserve constness of buf while extracting length value + + Fixes gcc warning: + io.c: In function 'WriteToClient': + io.c:826:6: warning: cast discards qualifiers from pointer target type + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 2c9800f91559fbb12dd276cf0536631104092f67 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:33 2011 -0800 + + OsInit: store "/dev/null" in a const char * + + It's only passed as the input side of a strcpy and as the filename to + fopen, so doesn't need to be non-const. Fixes gcc warning: + + osinit.c: In function 'OsInit': + osinit.c:154:28: warning: initialization discards qualifiers from pointer target type + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 50b1097643934c8caec9530e5eda6ed6534aaf61 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:33 2011 -0800 + + Constify the reason string throughout the authorization check framework + + Almost all of the places the string is assigned point to a literal + string constant, so use const char * for those, and const char ** + for function calls that return it via an argument. Fortunately + the top level function, ClientAuthorized, which returns the string + as its return value is called from only one place, ProcEstablishConnection. + + ProcEstablishConnection stores either that return value or a string literal + in char *reason. It only uses reason as an argument to SendConnSetup. + SendConnSetup passes the reason argument to strlen & WriteToClient, + both of which already have const qualifiers on their args. + Thus added const to the reason variable in ProcEstablishConnection + and the reason argument to SendConnSetup. + + Fixes gcc warnings: + dispatch.c: In function 'ProcEstablishConnection': + dispatch.c:3711:9: warning: assignment discards qualifiers from pointer target type + auth.c: In function 'CheckAuthorization': + auth.c:218:14: warning: assignment discards qualifiers from pointer target type + auth.c:220:20: warning: assignment discards qualifiers from pointer target type + connection.c: In function 'ClientAuthorized': + connection.c:683:3: warning: return discards qualifiers from pointer target type + mitauth.c: In function 'MitCheckCookie': + mitauth.c:88:13: warning: assignment discards qualifiers from pointer target type + xdmauth.c:259:14: warning: assignment discards qualifiers from pointer target type + xdmauth.c:270:14: warning: assignment discards qualifiers from pointer target type + xdmauth.c:277:11: warning: assignment discards qualifiers from pointer target type + xdmauth.c:293:15: warning: assignment discards qualifiers from pointer target type + xdmauth.c:313:14: warning: assignment discards qualifiers from pointer target type + xdmauth.c:322:11: warning: assignment discards qualifiers from pointer target type + rpcauth.c: In function 'SecureRPCCheck': + rpcauth.c:136:10: warning: assignment discards qualifiers from pointer target type + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 99998196017ef38ec88459b50605aa20f628788b +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:33 2011 -0800 + + Constify string for authorization protocol names + + gcc was warning from storing string constants in a char *name field: + auth.c:64:1: warning: initialization discards qualifiers from pointer target type + auth.c:72:1: warning: initialization discards qualifiers from pointer target type + auth.c:81:1: warning: initialization discards qualifiers from pointer target type + + Making the field const requires changing AuthorizationFromID to take + a const char ** pointer for the name argument which it sets to point + to the matching name entry. + + Changing that argument requires changing its sole caller in the security + extension to pass the address of a const char * variable to it, which it + can do, since the only thing it does with the returned name is to pass + it back to the RemoveAuthorization function that already expects a const + char *name. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Jamey Sharp <ja...@minilop.net> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 01834e99e461e2a8354f3b4aef7f14c5e83fa255 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Mon Dec 12 16:49:33 2011 -0800 + + os/access.c: replace acmp & acopy macros with memcmp & memcpy calls + + No need to cast to char * now that all supported platforms use C89-standard -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rcmpx-000489...@vasks.debian.org