diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-16 20:45:15 +0100 |
|---|---|---|
| committer | Marc Haesen <marc@hc-consult.be> | 2011-12-16 20:45:15 +0100 |
| commit | 47913e82955ec8e2b1ba4d4b145497dede9163b5 (patch) | |
| tree | d23c322caf26864270171d54eb2805cee2721e4d /xorg-server/hw/xfree86/common/xf86Helper.c | |
| parent | 53d28537755790ee4625dc16f560cad5aa93f56b (diff) | |
| download | vcxsrv-47913e82955ec8e2b1ba4d4b145497dede9163b5.tar.gz vcxsrv-47913e82955ec8e2b1ba4d4b145497dede9163b5.tar.bz2 vcxsrv-47913e82955ec8e2b1ba4d4b145497dede9163b5.zip | |
xserver git update 16 dec 2011
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Helper.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Helper.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c index d99522cf6..248ccf47e 100644 --- a/xorg-server/hw/xfree86/common/xf86Helper.c +++ b/xorg-server/hw/xfree86/common/xf86Helper.c @@ -1734,7 +1734,6 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, int format, unsigned long len, pointer value ) { RootWinPropPtr pNewProp = NULL, pRegProp; - int i; Bool existing = FALSE; DebugF("xf86RegisterRootWindowProperty(%d, %ld, %ld, %d, %ld, %p)\n", @@ -1775,15 +1774,11 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, DebugF("new property filled\n"); - if (NULL==xf86RegisteredPropertiesTable) { + if (xf86RegisteredPropertiesTable == NULL) { DebugF("creating xf86RegisteredPropertiesTable[] size %d\n", xf86NumScreens); - if ( NULL==(xf86RegisteredPropertiesTable=(RootWinPropPtr*)xnfcalloc(sizeof(RootWinProp),xf86NumScreens) )) { - return BadAlloc; - } - for (i=0; i<xf86NumScreens; i++) { - xf86RegisteredPropertiesTable[i] = NULL; - } + xf86RegisteredPropertiesTable = + xnfcalloc(sizeof(RootWinProp), xf86NumScreens); } DebugF("xf86RegisteredPropertiesTable %p\n", |