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

14
randr/rrmode.c
View File

@@ -58,7 +58,7 @@ RRModeCreate (xRRModeInfo *modeInfo,
if (!RRInit ())
return NULL;
mode = xalloc (sizeof (RRModeRec) + modeInfo->nameLength + 1);
mode = malloc(sizeof (RRModeRec) + modeInfo->nameLength + 1);
if (!mode)
return NULL;
mode->refcnt = 1;
@@ -69,13 +69,13 @@ RRModeCreate (xRRModeInfo *modeInfo,
mode->userScreen = userScreen;
if (num_modes)
newModes = xrealloc (modes, (num_modes + 1) * sizeof (RRModePtr));
newModes = realloc(modes, (num_modes + 1) * sizeof (RRModePtr));
else
newModes = xalloc (sizeof (RRModePtr));
newModes = malloc(sizeof (RRModePtr));
if (!newModes)
{
xfree (mode);
free(mode);
return NULL;
}
@@ -164,7 +164,7 @@ RRModesForScreen (ScreenPtr pScreen, int *num_ret)
RRModePtr *screen_modes;
int num_screen_modes = 0;
screen_modes = xalloc ((num_modes ? num_modes : 1) * sizeof (RRModePtr));
screen_modes = malloc((num_modes ? num_modes : 1) * sizeof (RRModePtr));
if (!screen_modes)
return NULL;
@@ -243,14 +243,14 @@ RRModeDestroy (RRModePtr mode)
num_modes--;
if (!num_modes)
{
xfree (modes);
free(modes);
modes = NULL;
}
break;
}
}
xfree (mode);
free(mode);
}
static int