aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* xfixes: fix compiler warningUlrich Sibiller2017-03-101-2/+3
| | | | | | | | | | | | | | | | | | | cursor.c: In function ‘TestForCursorName’: cursor.c:649:30: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] return (pCursor->name == (Atom) closure); ^ cursor.c: In function ‘ProcXFixesChangeCursorByName’: cursor.c:665:45: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ReplaceCursor (pSource, TestForCursorName, (void *) name); ^ Backport of commit 019ad5acd20e34dc2aa3b89cc426138db5164c48 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Feb 5 15:44:41 2008 -0500 XFixes: squash a pointer/integer size mismatch warning.
* xfixes: fix compiler warningsUlrich Sibiller2017-03-101-2/+2
| | | | | | | | | | | cursor.c: In function ‘ProcXFixesGetCursorName’: cursor.c:399:6: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default] str = NameForAtom (pCursor->name); ^ cursor.c: In function ‘ProcXFixesGetCursorImageAndName’: cursor.c:453:10: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default] name = pCursor->name ? NameForAtom (pCursor->name) : ""; ^
* render/filter.c: add missing return valueUlrich Sibiller2017-03-101-1/+1
| | | | | | | | | Fixes filter.c: In function ‘SetPicturePictFilter’: filter.c:363:5: warning: ‘return’ with no value, in function returning non-void [enabled by default] return ; ^
* record.c: fix compiler warningsUlrich Sibiller2017-03-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | record.c: In function ‘RecordAReply’: record.c:714:7: warning: passing argument 4 of ‘RecordAProtocolElement’ discards ‘const’ qualifier from pointer target type [enabled by default] pri->replyData, pri->dataLenBytes, /* continuation */ -1); ^ record.c:286:1: note: expected ‘void *’ but argument is of type ‘const void *’ RecordAProtocolElement(RecordContextPtr pContext, ClientPtr pClient, ^ record.c:724:10: warning: passing argument 4 of ‘RecordAProtocolElement’ discards ‘const’ qualifier from pointer target type [enabled by default] pri->replyData, pri->dataLenBytes, pri->bytesRemaining); ^ record.c:286:1: note: expected ‘void *’ but argument is of type ‘const void *’ RecordAProtocolElement(RecordContextPtr pContext, ClientPtr pClient, ^ record.c:746:5: warning: passing argument 4 of ‘RecordAProtocolElement’ discards ‘const’ qualifier from pointer target type [enabled by default] pri->dataLenBytes, pri->bytesRemaining); ^ record.c:286:1: note: expected ‘void *’ but argument is of type ‘const void *’ RecordAProtocolElement(RecordContextPtr pContext, ClientPtr pClient, ^
* fb: fix compiler warningUlrich Sibiller2017-03-101-2/+0
| | | | | | fbtrap.c: In function ‘fbRasterizeTrapezoid’: fbtrap.c:113:12: warning: variable ‘x_off_fixed’ set but not used [-Wunused-but-set-variable] xFixed x_off_fixed;
* dix: Fix compiler warningUlrich Sibiller2017-03-101-1/+2
| | | | | | devices.c: In function ‘_AddInputDevice’: devices.c:120:22: warning: assignment from incompatible pointer type [enabled by default] dev->devPrivates = dev->unwrapProc = NULL;
* Display.c: remove unused logo codeUlrich Sibiller2017-03-101-37/+0
|
* Rootless.c: improve debugging outputUlrich Sibiller2017-03-101-4/+4
|
* Rootless.c: improve malloc failure handlingUlrich Sibiller2017-03-101-2/+34
|
* Rootless.c: fix possible memleakUlrich Sibiller2017-03-101-0/+1
|
* Display.c: pid is always 0, remove checkUlrich Sibiller2017-03-101-1/+1
|
* Window.c: Fix reference before check for null pointerUlrich Sibiller2017-03-101-3/+7
|
* Keyboard.c: Simplify if clauseUlrich Sibiller2017-03-101-4/+2
|
* Rootless.c: Fix wrongly negated comparisonsUlrich Sibiller2017-03-101-2/+2
|
* Args.c: Fix missing parenthesesUlrich Sibiller2017-03-101-0/+2
|
* nxcomp/ChannelEndPoint.cpp: we're not really testing for a character, but a ↵Mihai Moldovan2017-03-091-1/+1
| | | | | | pointer. Fixes: ArcticaProject/nxlibs#389.
* Merge branch 'uli42-pr/backup_null_rulesfile' into 3.6.xMihai Moldovan2017-03-071-5/+25
|\ | | | | | | | | | | Attributes GH PR #372: https://github.com/ArcticaProject/nx-libs/pull/372 Fixes: ArcticaProject/nx-libs#371.
| * xkb: Allow NULL as rulesFile in XkbSetRulesDflts.Peter Hutterer2017-03-071-5/+25
|/ | | | | | | | | | | If no rules file is given, simply re-use the previous one. If no RF is given the first time this function is called, use the built-in default. This includes fixing the built-in default to something that actually exists. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de> Fixes ArcticaProject/nx-libs#371
* Merge branch 'uli42-pr/cve-2017-2624' into 3.6.xMihai Moldovan2017-03-075-3/+63
|\ | | | | | | | | | | Attributes GH PR #380: https://github.com/ArcticaProject/nx-libs/pull/380 Fixes: ArcticaProject/nx-libs#365.
| * os: add timingsafe_memcmp to ImakeUlrich Sibiller2017-03-042-2/+10
| | | | | | | | | | There might be some library linking missing on platforms that deliver timingsafe_memcmp but I cannot test that here.
| * Backport CVE-2017-2624 (timingsafe_memcmp)Ulrich Sibiller2017-03-034-3/+55
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes ArcticaProject/nx-libs#365 These two commits: commit 5c44169caed811e59a65ba346de1cadb46d266ec Author: Adam Jackson <ajax@redhat.com> Date: Thu Mar 2 17:20:30 2017 -0500 os: Squash missing declaration warning for timingsafe_memcmp timingsafe_memcmp.c:21:1: warning: no previous prototype for ‘timingsafe_memcmp’ [-Wmissing-prototypes] timingsafe_memcmp(const void *b1, const void *b2, size_t len) Signed-off-by: Adam Jackson <ajax@redhat.com> commit d7ac755f0b618eb1259d93c8a16ec6e39a18627c Author: Matthieu Herrb <matthieu@herrb.eu> Date: Tue Feb 28 19:18:25 2017 +0100 Use timingsafe_memcmp() to compare MIT-MAGIC-COOKIES CVE-2017-2624 Provide the function definition for systems that don't have it. Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
* Merge branch 'uli42-pr/fix_validatestring' into 3.6.xMike Gabriel2017-03-0318-90/+73
|\ | | | | | | Attributes GH PR #359: https://github.com/ArcticaProject/nx-libs/pull/359
| * replace (DE)ALLOCATE_LOCAL by malloc/freeUlrich Sibiller2017-03-0348-347/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is basically a backport of the following commits + replacing xalloc/xfree by malloc/free. Fixes ArcticaProject/nx-libs#358. commit 2761c103311a1160bc483fd0367d654733df8598 Author: Daniel Stone <daniel@fooishbar.org> Date: Mon Nov 5 14:03:26 2007 +0000 OS: Remove usage of alloca Replace with heap allocations. commit 5e363500c86042c394595e1a6633581eb8fcd1bb Author: Daniel Stone <daniel@fooishbar.org> Date: Mon Nov 5 14:38:28 2007 +0000 OS: Remove ALLOCATE_LOCAL from os.h Remove ALLOCATE_LOCAL_FALLBACK and DEALLOCATE_LOCAL_FALLBACK from os.h, and remove the include of Xalloca.h as well.
| * nxagent: move validateString as inline func to Utils.hUlrich Sibiller2017-03-037-9/+8
| |
| * xkb: add missing constUlrich Sibiller2017-03-031-1/+2
| | | | | | | | | | this was missing from the backport of 5623c27700b7b23a8dbbd8c8f45e5d4fa0c667e3 (Constify atom name strings)
| * xkb: remove XkbAtomGetString, replace with NameForAtom.Peter Hutterer2017-03-035-15/+8
| | | | | | | | | | | | | | | | | | XKB really XKBdoes not XKBneed its own XKBdefines for XKBeverything. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * Replace _XkbDupString with XstrdupAlan Coopersmith2017-03-039-72/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | The two functions have identical semantics, including safely returning NULL when NULL is passed in (which POSIX strdup does not guarantee). Some callers could probably be adjusted to call libc strdup directly, when we know the input is non-NULL. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| * nxagent: half number of NameForAtom callsUlrich Sibiller2017-03-036-2/+9
| | | | | | | | | | | | | | | | Because of validateString being a macro NameForAtom was called twice most of the time. Fix that by making validateString a function. Fixes ArticaProject/nx-libs#357
* | Merge branch 'uli42-pr/remove_allocate_local' into 3.6.xMike Gabriel2017-03-0348-347/+340
|\ \ | |/ |/| | | Attribute GH PR #369: https://github.com/ArcticaProject/nx-libs/pull/369
| * replace (DE)ALLOCATE_LOCAL by malloc/freeUlrich Sibiller2017-03-0348-347/+340
|/ | | | | | | | | | | | | | | | | | | | | | This is basically a backport of the following commits + replacing xalloc/xfree by malloc/free. Fixes ArcticaProject/nx-libs#358. commit 2761c103311a1160bc483fd0367d654733df8598 Author: Daniel Stone <daniel@fooishbar.org> Date: Mon Nov 5 14:03:26 2007 +0000 OS: Remove usage of alloca Replace with heap allocations. commit 5e363500c86042c394595e1a6633581eb8fcd1bb Author: Daniel Stone <daniel@fooishbar.org> Date: Mon Nov 5 14:38:28 2007 +0000 OS: Remove ALLOCATE_LOCAL from os.h Remove ALLOCATE_LOCAL_FALLBACK and DEALLOCATE_LOCAL_FALLBACK from os.h, and remove the include of Xalloca.h as well.
* Merge branch 'sunweaver-pr/really-enable-MITSHM-in-fboverlay-c' into 3.6.xMihai Moldovan2017-03-034-2/+54
|\ | | | | | | Attributes GH PR #318: https://github.com/ArcticaProject/nx-libs/pull/318
| * Xserver/mi/miscrinit.c: Use new shmint.h for making ShmRegisterFbFuncs() ↵Mike Gabriel2017-03-031-2/+1
| | | | | | | | available.
| * Xserver/fb/fboverlay.c: Define -DMITSHM at build as it is used in fboverlay.c.Mike Gabriel2017-03-032-0/+9
| | | | | | | | Fixes ArcticaProject/nx-libs#237.
| * Xserver/Xext/shmint.h: Provide header file exporting ShmRegisterFunc and ↵Mike Gabriel2017-03-031-0/+44
|/ | | | | | | | | | | | | | ShmRegisterFbFuncs (plus ShmSetPixmapFormat as a by-product). commit 9ceffb6b92e55f0d74d71489900d43940f14dfd9 Author: Eric Anholt <anholt@freebsd.org> Date: Wed Dec 28 10:37:17 2005 +0000 Merge from xserver a header for shm's server internal functions, which are called by DDXes. Desired by XGL, and should be used in other locations, probably. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Merge branch 'sunweaver-pr/fix-unused-libNX_X11-files' into 3.6.xMihai Moldovan2017-03-0311-2368/+14
|\ | | | | | | | | | | Attributes GH PR #310: https://github.com/ArcticaProject/nx-libs/pull/310 Fixes: ArcticaProject/nx-libs#265.
| * libNX_X11: Fully drop loadable i18n module support in libNX_X11.Mike Gabriel2017-03-036-2340/+3
| | | | | | | | | | | | - Support for i18n in libNX_X11 is static only, has ever been. - Thus, the files XlcSL.[co], XlcDL.[co], XDefaultIMIF.[co], XDefaultOMIF.[co] and lcDynamic.[co] become obsolete.
| * libNX_X11/lcUTF8.c: Drop not-used X11/lcUniConv/ascii.h.Mike Gabriel2017-03-032-28/+0
| |
| * doc/libNX_X11/lcUniConv: Move over the rather-documentary files ↵Mike Gabriel2017-03-032-0/+0
| | | | | | | | 8bit_tab_to_h.c and cjk_tab_to_h.c to nx-libs's doc/ folder.
| * doc/libNX_X11/lcUniConv: Pull over README from X.org's libX11 to document ↵Mike Gabriel2017-03-031-0/+11
|/ | | | the origin and purpose of 8bit_tab_to_h.c and cjk_tab_to_h.c.
* Merge branch 'sunweaver-pr/happyvalgrind-in-glXQueryVersion' into 3.6.xMike Gabriel2017-03-031-0/+2
|\ | | | | | | Attributes GH PR #374: https://github.com/ArcticaProject/nx-libs/pull/374
| * Xserver/GL/glx/glxcmd.c: Fix uninitialized xGLXQueryVersionReply.Mike Gabriel2017-03-031-0/+2
|/ | | | Fixes ArcticaProject/nx-libs#324.
* misc nx-X11/programs/Xserver/randr/: switch to using xreallocarray, since it ↵Mihai Moldovan2017-03-036-60/+0
| | | | has been ported now.
* misc nx-X11/programs/Xserver/{composite,dix,randr}/: switch to using ↵Mihai Moldovan2017-03-037-62/+0
| | | | reallocarray, since it has been ported now.
* nx-X11/programs/Xserver/include/os.h: backport xallocarray().Mihai Moldovan2017-03-031-0/+2
|
* nx-X11/{config/cf/{{Imake,X11}.tmpl,linux.cf},programs/Xserver/{include/os.h ↵Mihai Moldovan2017-03-036-3/+70
| | | | ,os/{Imakefile,reallocarray.c}}: backport reallocarray() implementation.
* misc nx-X11/programs/Xserver/{hw/nxagent,miext,render}/: move code around so ↵Mihai Moldovan2017-03-0312-557/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | that we can drop nx-X11/programs/Xserver/render/miglyph.c (and by extension nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.) This is essentially a bastardized cross/backport of these X.Org commits - based on our current architecture: commit 4b14c9a9cd2033d3839c4ba364d41ab4c4b198ab Author: Eric Anholt <eric@anholt.net> Date: Fri Oct 19 16:34:54 2007 -0700 Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code. Not all of the DDX/miext Glyphs hook implementations have been removed, but they should be. and commit 2251572062b2c25643671b8d5070de1c3f7ae976 Author: Aaron Plattner <aplattner@nvidia.com> Date: Fri Oct 26 15:13:50 2007 -0700 Restore the CompositeGlyphs -> ps->Glyphs -> miGlyphs callchain to allow acceleration architectures to wrap above miGlyphs. Conflicts: nx-X11/programs/Xserver/render/miglyph.c nx-X11/programs/Xserver/render/mipict.h nx-X11/programs/Xserver/render/picture.c
* nx-X11/programs/Xserver/mi/{Imakefile,mibank.{c,h}}: backport ↵Mihai Moldovan2017-03-033-2697/+0
| | | | | | | | ffaae7c0c69a51a53a76146c79f3630ae197a443. Down with mibank! Fixes ArcticaProject/nx-libs#366.
* Merge branch 'sunweaver-pr/happyvalgrind-nxagentResetSignalHandlers' into 3.6.xMike Gabriel2017-03-031-0/+2
|\ | | | | | | | | | | Attributes GH PR #375: https://github.com/ArcticaProject/nx-libs/pull/375 Reviewed-by: Ulrich Sibiller <uli42@gmx.de> -- Fri, 03 Mar 2017 02:20:38 -0800
| * hw/nxagent/Display.c: Fix uninitialized newAction in ↵Mike Gabriel2017-03-031-0/+2
|/ | | | | | nxagentResetSignalHandlers(). Fixes ArcticaProject/nx-libs#328.
* Merge branch 'uli42-pr/happyvalgrind' into 3.6.xMike Gabriel2017-03-0317-47/+93
|\ | | | | | | | | | | | | Fixes ArcticaProject/nx-libs#325. Fixes ArcticaProject/nx-libs#326. Attribute GH PR #360: https://github.com/ArcticaProject/nx-libs/pull/360
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:21:17 +0000