hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-09 23:22:22 +00:00
Code Issues 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
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/common/xf86sbusBus.c
View file

@ -85,7 +85,7 @@ xf86SbusProbe(void)
char fbDevName[32];
sbusDevicePtr psdp, *psdpp;
xf86SbusInfo = xalloc(sizeof(psdp));
xf86SbusInfo = malloc(sizeof(psdp));
*xf86SbusInfo = NULL;
for (i = 0; i < 32; i++) {
sprintf(fbDevName, "/dev/fb%d", i);
@ -210,7 +210,7 @@ xf86SbusProbe(void)
promPath = sparcPromNode2Pathname (&psdp->node);
if (promPath) {
xf86ErrorF(" at %s", promPath);
xfree(promPath);
free(promPath);
}
} else
xf86Msg(X_PROBED, "SBUS: %s", psdp->descr);
@ -397,7 +397,7 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
* allow the config file to override this.
*/
if (allocatedInstances <= 0) {
xfree(instances);
free(instances);
return 0;
}
@ -419,7 +419,7 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
pGDev->chipID = pGDev->chipRev = -1;
}
}
xfree(instances);
free(instances);
if (useProm)
sparcPromClose();
return actualcards;
@ -479,7 +479,7 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
instances[i].dev = dev;
}
if (promPath)
xfree(promPath);
free(promPath);
}
DebugF("%s instances found: %d\n", driverName, numClaimedInstances);
@ -506,7 +506,7 @@ xf86MatchSbusInstances(const char *driverName, int sbusDevId,
= xf86ClaimSbusSlot(psdp, drvp, instances[i].dev,instances[i].dev->active ?
TRUE : FALSE);
}
xfree(instances);
free(instances);
if (numFound > 0) {
*foundEntities = retEntities;
}
@ -607,7 +607,7 @@ xf86SbusCmapLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
int i, index;
sbusCmapPtr cmap;
struct fbcmap fbcmap;
unsigned char *data = xalloc(numColors*3);
unsigned char *data = malloc(numColors*3);
cmap = SBUSCMAPPTR(pScrn->pScreen);
if (!cmap) return;
@ -628,7 +628,7 @@ xf86SbusCmapLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
fbcmap.blue[fbcmap.count++] = colors[index].blue;
}
ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
xfree(data);
free(data);
}
static Bool
@ -647,7 +647,7 @@ xf86SbusCmapCloseScreen(int i, ScreenPtr pScreen)
ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
}
pScreen->CloseScreen = cmap->CloseScreen;
xfree (cmap);
free(cmap);
return (*pScreen->CloseScreen) (i, pScreen);
}