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

40
mi/mifillarc.c
View File

@@ -546,13 +546,13 @@ miFillEllipseI(
int *widths;
int *wids;
points = xalloc(sizeof(DDXPointRec) * arc->height);
points = malloc(sizeof(DDXPointRec) * arc->height);
if (!points)
return;
widths = xalloc(sizeof(int) * arc->height);
widths = malloc(sizeof(int) * arc->height);
if (!widths)
{
xfree(points);
free(points);
return;
}
miFillArcSetup(arc, &info);
@@ -570,8 +570,8 @@ miFillEllipseI(
ADDSPANS();
}
(*pGC->ops->FillSpans)(pDraw, pGC, pts - points, points, widths, FALSE);
xfree(widths);
xfree(points);
free(widths);
free(points);
}
static void
@@ -589,13 +589,13 @@ miFillEllipseD(
int *widths;
int *wids;
points = xalloc(sizeof(DDXPointRec) * arc->height);
points = malloc(sizeof(DDXPointRec) * arc->height);
if (!points)
return;
widths = xalloc(sizeof(int) * arc->height);
widths = malloc(sizeof(int) * arc->height);
if (!widths)
{
xfree(points);
free(points);
return;
}
miFillArcDSetup(arc, &info);
@@ -613,8 +613,8 @@ miFillEllipseD(
ADDSPANS();
}
(*pGC->ops->FillSpans)(pDraw, pGC, pts - points, points, widths, FALSE);
xfree(widths);
xfree(points);
free(widths);
free(points);
}
#define ADDSPAN(l,r) \
@@ -661,13 +661,13 @@ miFillArcSliceI(
slw = arc->height;
if (slice.flip_top || slice.flip_bot)
slw += (arc->height >> 1) + 1;
points = xalloc(sizeof(DDXPointRec) * slw);
points = malloc(sizeof(DDXPointRec) * slw);
if (!points)
return;
widths = xalloc(sizeof(int) * slw);
widths = malloc(sizeof(int) * slw);
if (!widths)
{
xfree(points);
free(points);
return;
}
if (pGC->miTranslate)
@@ -698,8 +698,8 @@ miFillArcSliceI(
}
}
(*pGC->ops->FillSpans)(pDraw, pGC, pts - points, points, widths, FALSE);
xfree(widths);
xfree(points);
free(widths);
free(points);
}
static void
@@ -725,13 +725,13 @@ miFillArcSliceD(
slw = arc->height;
if (slice.flip_top || slice.flip_bot)
slw += (arc->height >> 1) + 1;
points = xalloc(sizeof(DDXPointRec) * slw);
points = malloc(sizeof(DDXPointRec) * slw);
if (!points)
return;
widths = xalloc(sizeof(int) * slw);
widths = malloc(sizeof(int) * slw);
if (!widths)
{
xfree(points);
free(points);
return;
}
if (pGC->miTranslate)
@@ -762,8 +762,8 @@ miFillArcSliceD(
}
}
(*pGC->ops->FillSpans)(pDraw, pGC, pts - points, points, widths, FALSE);
xfree(widths);
xfree(points);
free(widths);
free(points);
}
/* MIPOLYFILLARC -- The public entry for the PolyFillArc request.