SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace X-allocation functions with their C89 counterparts

Browse Source 
The only remaining X-functions used in server are XNF*, the rest is converted to
plain alloc/calloc/realloc/free/strdup.

X* functions are still exported from server and x* macros are still defined in
header file, so both ABI and API are not affected by this change.

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Mikhail Gusarov
2010-05-06 01:44:06 +07:00
parent 96c7ab27c3
commit 3f3ff971ec
345 changed files with 3011 additions and 3011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hw/xfree86/os-support/linux/int10/linux.c
View File

@@ -100,7 +100,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
options = xf86HandleInt10Options(xf86Screens[screen],entityIndex);
if (int10skip(options)) {
xfree(options);
free(options);
return NULL;
}
@@ -290,7 +290,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
dprint(0xc0000, 0x20);
#endif
xfree(options);
free(options);
return pInt;
error3:
@@ -308,11 +308,11 @@ error2:
error1:
if (vMem)
munmap(vMem, SYS_BIOS - V_BIOS);
xfree(((linuxInt10Priv*)pInt->private)->alloc);
xfree(pInt->private);
free(((linuxInt10Priv*)pInt->private)->alloc);
free(pInt->private);
error0:
xfree(options);
xfree(pInt);
free(options);
free(pInt);
return NULL;
}
@@ -399,9 +399,9 @@ xf86FreeInt10(xf86Int10InfoPtr pInt)
shmctl(((linuxInt10Priv*)pInt->private)->lowMem, IPC_RMID, NULL);
if (((linuxInt10Priv*)pInt->private)->highMem >= 0)
shmctl(((linuxInt10Priv*)pInt->private)->highMem, IPC_RMID, NULL);
xfree(((linuxInt10Priv*)pInt->private)->alloc);
xfree(pInt->private);
xfree(pInt);
free(((linuxInt10Priv*)pInt->private)->alloc);
free(pInt->private);
free(pInt);
}
void *