frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xnest: replace xallocarray() by calloc() 

Only key difference that calloc(), in contrast to rellocarray(),
is zero-initializing. The overhead is hard to measure on today's
machines, and it's safer programming practise to always allocate
zero-initialized, so one can't forget to do it explicitly.

Cocci rule:

    @@
    expression COUNT;
    expression LEN;
    @@
    - xallocarray(COUNT,LEN)
    + calloc(COUNT,LEN)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-02-24 12:15:01 +01:00
parent f203f3f1f1
commit 09af7f6a5b
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/xnest/Color.c
View File

@ -62,7 +62,7 @@ xnestCreateColormap(ColormapPtr pCmap)
switch (pVisual->class) { switch (pVisual->class) {
case StaticGray: /* read only */ case StaticGray: /* read only */
colors = xallocarray(ncolors, sizeof(XColor)); colors = calloc(ncolors, sizeof(XColor));
for (i = 0; i < ncolors; i++) for (i = 0; i < ncolors; i++)
colors[i].pixel = i; colors[i].pixel = i;
XQueryColors(xnestDisplay, xnestColormap(pCmap), colors, ncolors); XQueryColors(xnestDisplay, xnestColormap(pCmap), colors, ncolors);
@ -75,7 +75,7 @@ xnestCreateColormap(ColormapPtr pCmap)
break; break;
case StaticColor: /* read only */ case StaticColor: /* read only */
colors = xallocarray(ncolors, sizeof(XColor)); colors = calloc(ncolors, sizeof(XColor));
for (i = 0; i < ncolors; i++) for (i = 0; i < ncolors; i++)
colors[i].pixel = i; colors[i].pixel = i;
XQueryColors(xnestDisplay, xnestColormap(pCmap), colors, ncolors); XQueryColors(xnestDisplay, xnestColormap(pCmap), colors, ncolors);
@ -88,7 +88,7 @@ xnestCreateColormap(ColormapPtr pCmap)
break; break;
case TrueColor: /* read only */ case TrueColor: /* read only */
colors = xallocarray(ncolors, sizeof(XColor)); colors = calloc(ncolors, sizeof(XColor));
red = green = blue = 0L; red = green = blue = 0L;
redInc = lowbit(pVisual->redMask); redInc = lowbit(pVisual->redMask);
greenInc = lowbit(pVisual->greenMask); greenInc = lowbit(pVisual->greenMask);
@ -194,12 +194,12 @@ xnestSetInstalledColormapWindows(ScreenPtr pScreen)
xnestInstalledColormapWindows icws; xnestInstalledColormapWindows icws;
int numWindows; int numWindows;
icws.cmapIDs = xallocarray(pScreen->maxInstalledCmaps, sizeof(Colormap)); icws.cmapIDs = calloc(pScreen->maxInstalledCmaps, sizeof(Colormap));
icws.numCmapIDs = xnestListInstalledColormaps(pScreen, icws.cmapIDs); icws.numCmapIDs = xnestListInstalledColormaps(pScreen, icws.cmapIDs);
icws.numWindows = 0; icws.numWindows = 0;
WalkTree(pScreen, xnestCountInstalledColormapWindows, (void *) &icws); WalkTree(pScreen, xnestCountInstalledColormapWindows, (void *) &icws);
if (icws.numWindows) { if (icws.numWindows) {
icws.windows = xallocarray(icws.numWindows + 1, sizeof(Window)); icws.windows = calloc(icws.numWindows + 1, sizeof(Window));
icws.index = 0; icws.index = 0;
WalkTree(pScreen, xnestGetInstalledColormapWindows, (void *) &icws); WalkTree(pScreen, xnestGetInstalledColormapWindows, (void *) &icws);
icws.windows[icws.numWindows] = xnestDefaultWindows[pScreen->myNum]; icws.windows[icws.numWindows] = xnestDefaultWindows[pScreen->myNum];
@ -218,7 +218,7 @@ xnestSetInstalledColormapWindows(ScreenPtr pScreen)
#ifdef _XSERVER64 #ifdef _XSERVER64
{ {
int i; int i;
Window64 *windows = xallocarray(numWindows, sizeof(Window64)); Window64 *windows = calloc(numWindows, sizeof(Window64));
for (i = 0; i < numWindows; ++i) for (i = 0; i < numWindows; ++i)
windows[i] = icws.windows[i]; windows[i] = icws.windows[i];
@ -390,7 +390,7 @@ xnestStoreColors(ColormapPtr pCmap, int nColors, xColorItem * pColors)
#ifdef _XSERVER64 #ifdef _XSERVER64
{ {
int i; int i;
XColor *pColors64 = xallocarray(nColors, sizeof(XColor)); XColor *pColors64 = calloc(nColors, sizeof(XColor));
for (i = 0; i < nColors; ++i) { for (i = 0; i < nColors; ++i) {
pColors64[i].pixel = pColors[i].pixel; pColors64[i].pixel = pColors[i].pixel;

3
hw/xnest/Display.c
View File

@ -117,8 +117,7 @@ xnestOpenDisplay(int argc, char *argv[])
} }
xnestNumDefaultColormaps = xnestNumVisuals; xnestNumDefaultColormaps = xnestNumVisuals;
xnestDefaultColormaps = xallocarray(xnestNumDefaultColormaps, xnestDefaultColormaps = calloc(xnestNumDefaultColormaps, sizeof(Colormap));
sizeof(Colormap));
for (i = 0; i < xnestNumDefaultColormaps; i++) for (i = 0; i < xnestNumDefaultColormaps; i++)
xnestDefaultColormaps[i] = XCreateColormap(xnestDisplay, xnestDefaultColormaps[i] = XCreateColormap(xnestDisplay,
DefaultRootWindow DefaultRootWindow

2
hw/xnest/GC.c
View File

@ -203,7 +203,7 @@ xnestChangeClip(GCPtr pGC, int type, void *pValue, int nRects)
case CT_REGION: case CT_REGION:
nRects = RegionNumRects((RegionPtr) pValue); nRects = RegionNumRects((RegionPtr) pValue);
pRects = xallocarray(nRects, sizeof(*pRects)); pRects = calloc(nRects, sizeof(*pRects));
pBox = RegionRects((RegionPtr) pValue); pBox = RegionRects((RegionPtr) pValue);
for (i = nRects; i-- > 0;) { for (i = nRects; i-- > 0;) {
pRects[i].x = pBox[i].x1; pRects[i].x = pBox[i].x1;

2
hw/xnest/Keyboard.c
View File

@ -119,7 +119,7 @@ xnestKeyboardProc(DeviceIntPtr pDev, int onoff)
max_keycode - min_keycode + 1, max_keycode - min_keycode + 1,
&mapWidth); &mapWidth);
len = (max_keycode - min_keycode + 1) * mapWidth; len = (max_keycode - min_keycode + 1) * mapWidth;
keymap = xallocarray(len, sizeof(KeySym)); keymap = calloc(len, sizeof(KeySym));
for (i = 0; i < len; ++i) for (i = 0; i < len; ++i)
keymap[i] = keymap64[i]; keymap[i] = keymap64[i];
XFree(keymap64); XFree(keymap64);

2
hw/xnest/Screen.c
View File

@ -163,7 +163,7 @@ xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
PRIVATE_CURSOR, 0)) PRIVATE_CURSOR, 0))
return FALSE; return FALSE;
visuals = xallocarray(xnestNumVisuals, sizeof(VisualRec)); visuals = calloc(xnestNumVisuals, sizeof(VisualRec));
numVisuals = 0; numVisuals = 0;
depths = calloc(MAXDEPTH, sizeof(DepthRec)); depths = calloc(MAXDEPTH, sizeof(DepthRec));