Replace X-allocation functions with their C89 counterparts
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:
@@ -737,7 +737,7 @@ miZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
|
||||
dospans = (pGC->fillStyle != FillSolid);
|
||||
if (dospans)
|
||||
{
|
||||
widths = xalloc(sizeof(int) * numPts);
|
||||
widths = malloc(sizeof(int) * numPts);
|
||||
if (!widths)
|
||||
return;
|
||||
maxw = 0;
|
||||
@@ -754,12 +754,12 @@ miZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
|
||||
(unsigned char *) pGC->dash, (int)pGC->numInDashList,
|
||||
&dinfo.dashOffsetInit);
|
||||
}
|
||||
points = xalloc(sizeof(DDXPointRec) * numPts);
|
||||
points = malloc(sizeof(DDXPointRec) * numPts);
|
||||
if (!points)
|
||||
{
|
||||
if (dospans)
|
||||
{
|
||||
xfree(widths);
|
||||
free(widths);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -836,9 +836,9 @@ miZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs)
|
||||
}
|
||||
}
|
||||
}
|
||||
xfree(points);
|
||||
free(points);
|
||||
if (dospans)
|
||||
{
|
||||
xfree(widths);
|
||||
free(widths);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user