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

28
render/filter.c
View File

@@ -60,18 +60,18 @@ PictureGetFilterId (char *filter, int len, Bool makeit)
return i;
if (!makeit)
return -1;
name = xalloc (len + 1);
name = malloc(len + 1);
if (!name)
return -1;
memcpy (name, filter, len);
name[len] = '\0';
if (filterNames)
names = xrealloc (filterNames, (nfilterNames + 1) * sizeof (char *));
names = realloc(filterNames, (nfilterNames + 1) * sizeof (char *));
else
names = xalloc (sizeof (char *));
names = malloc(sizeof (char *));
if (!names)
{
xfree (name);
free(name);
return -1;
}
filterNames = names;
@@ -117,8 +117,8 @@ PictureFreeFilterIds (void)
int i;
for (i = 0; i < nfilterNames; i++)
xfree (filterNames[i]);
xfree (filterNames);
free(filterNames[i]);
free(filterNames);
nfilterNames = 0;
filterNames = 0;
}
@@ -144,9 +144,9 @@ PictureAddFilter (ScreenPtr pScreen,
if (ps->filters[i].id == id)
return -1;
if (ps->filters)
filters = xrealloc (ps->filters, (ps->nfilters + 1) * sizeof (PictFilterRec));
filters = realloc(ps->filters, (ps->nfilters + 1) * sizeof (PictFilterRec));
else
filters = xalloc (sizeof (PictFilterRec));
filters = malloc(sizeof (PictFilterRec));
if (!filters)
return -1;
ps->filters = filters;
@@ -177,11 +177,11 @@ PictureSetFilterAlias (ScreenPtr pScreen, char *filter, char *alias)
PictFilterAliasPtr aliases;
if (ps->filterAliases)
aliases = xrealloc (ps->filterAliases,
aliases = realloc(ps->filterAliases,
(ps->nfilterAliases + 1) *
sizeof (PictFilterAliasRec));
else
aliases = xalloc (sizeof (PictFilterAliasRec));
aliases = malloc(sizeof (PictFilterAliasRec));
if (!aliases)
return FALSE;
ps->filterAliases = aliases;
@@ -273,8 +273,8 @@ PictureResetFilters (ScreenPtr pScreen)
{
PictureScreenPtr ps = GetPictureScreen(pScreen);
xfree (ps->filters);
xfree (ps->filterAliases);
free(ps->filters);
free(ps->filterAliases);
PictureFreeFilterIds ();
}
@@ -335,10 +335,10 @@ SetPicturePictFilter (PicturePtr pPicture, PictFilterPtr pFilter,
if (nparams != pPicture->filter_nparams)
{
xFixed *new_params = xalloc (nparams * sizeof (xFixed));
xFixed *new_params = malloc(nparams * sizeof (xFixed));
if (!new_params && nparams)
return BadAlloc;
xfree (pPicture->filter_params);
free(pPicture->filter_params);
pPicture->filter_params = new_params;
pPicture->filter_nparams = nparams;
}