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

(1823) randr: 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 9fe0a77df0
commit aea4ae46f6
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
randr/rrcrtc.c
View File

@ -175,7 +175,7 @@ RRCrtcNotify(RRCrtcPtr crtc,
newoutputs = reallocarray(crtc->outputs, newoutputs = reallocarray(crtc->outputs,
numOutputs, sizeof(RROutputPtr)); numOutputs, sizeof(RROutputPtr));
else else
newoutputs = xallocarray(numOutputs, sizeof(RROutputPtr)); newoutputs = calloc(numOutputs, sizeof(RROutputPtr));
if (!newoutputs) if (!newoutputs)
return FALSE; return FALSE;
} }
@ -1057,7 +1057,7 @@ RRCrtcGammaSetSize(RRCrtcPtr crtc, int size)
if (size == crtc->gammaSize) if (size == crtc->gammaSize)
return TRUE; return TRUE;
if (size) { if (size) {
gamma = xallocarray(size, 3 * sizeof(CARD16)); gamma = calloc(size, 3 * sizeof(CARD16));
if (!gamma) if (!gamma)
return FALSE; return FALSE;
} }
@ -1293,7 +1293,7 @@ ProcRRSetCrtcConfig(ClientPtr client)
return BadMatch; return BadMatch;
} }
if (numOutputs) { if (numOutputs) {
outputs = xallocarray(numOutputs, sizeof(RROutputPtr)); outputs = calloc(numOutputs, sizeof(RROutputPtr));
if (!outputs) if (!outputs)
return BadAlloc; return BadAlloc;
} }

2
randr/rrmode.c
View File

@ -169,7 +169,7 @@ RRModesForScreen(ScreenPtr pScreen, int *num_ret)
RRModePtr *screen_modes; RRModePtr *screen_modes;
int num_screen_modes = 0; int num_screen_modes = 0;
screen_modes = xallocarray((num_modes ? num_modes : 1), sizeof(RRModePtr)); screen_modes = calloc((num_modes ? num_modes : 1), sizeof(RRModePtr));
if (!screen_modes) if (!screen_modes)
return NULL; return NULL;

6
randr/rroutput.c
View File

@ -132,7 +132,7 @@ RROutputSetClones(RROutputPtr output, RROutputPtr * clones, int numClones)
RROutputPtr *newClones = NULL; RROutputPtr *newClones = NULL;
if (numClones) { if (numClones) {
newClones = xallocarray(numClones, sizeof(RROutputPtr)); newClones = calloc(numClones, sizeof(RROutputPtr));
if (!newClones) if (!newClones)
return FALSE; return FALSE;
memcpy(newClones, clones, numClones * sizeof(RROutputPtr)); memcpy(newClones, clones, numClones * sizeof(RROutputPtr));
@ -164,7 +164,7 @@ RROutputSetModes(RROutputPtr output,
RRModePtr *newModes = NULL; RRModePtr *newModes = NULL;
if (numModes) { if (numModes) {
newModes = xallocarray(numModes, sizeof(RRModePtr)); newModes = calloc(numModes, sizeof(RRModePtr));
if (!newModes) if (!newModes)
return FALSE; return FALSE;
memcpy(newModes, modes, numModes * sizeof(RRModePtr)); memcpy(newModes, modes, numModes * sizeof(RRModePtr));
@ -263,7 +263,7 @@ RROutputSetCrtcs(RROutputPtr output, RRCrtcPtr * crtcs, int numCrtcs)
RRCrtcPtr *newCrtcs = NULL; RRCrtcPtr *newCrtcs = NULL;
if (numCrtcs) { if (numCrtcs) {
newCrtcs = xallocarray(numCrtcs, sizeof(RRCrtcPtr)); newCrtcs = calloc(numCrtcs, sizeof(RRCrtcPtr));
if (!newCrtcs) if (!newCrtcs)
return FALSE; return FALSE;
memcpy(newCrtcs, crtcs, numCrtcs * sizeof(RRCrtcPtr)); memcpy(newCrtcs, crtcs, numCrtcs * sizeof(RRCrtcPtr));

4
randr/rrproperty.c
View File

@ -206,7 +206,7 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
if (mode == PropModeReplace || len > 0) { if (mode == PropModeReplace || len > 0) {
void *new_data = NULL, *old_data = NULL; void *new_data = NULL, *old_data = NULL;
new_value.data = xallocarray(total_len, size_in_bytes); new_value.data = calloc(total_len, size_in_bytes);
if (!new_value.data && total_len && size_in_bytes) { if (!new_value.data && total_len && size_in_bytes) {
if (add) if (add)
RRDestroyOutputProperty(prop); RRDestroyOutputProperty(prop);
@ -478,7 +478,7 @@ ProcRRQueryOutputProperty(ClientPtr client)
return BadName; return BadName;
if (prop->num_valid) { if (prop->num_valid) {
extra = xallocarray(prop->num_valid, sizeof(INT32)); extra = calloc(prop->num_valid, sizeof(INT32));
if (!extra) if (!extra)
return BadAlloc; return BadAlloc;
} }

2
randr/rrtransform.c
View File

@ -65,7 +65,7 @@ RRTransformSetFilter(RRTransformPtr dst,
xFixed *new_params; xFixed *new_params;
if (nparams) { if (nparams) {
new_params = xallocarray(nparams, sizeof(xFixed)); new_params = calloc(nparams, sizeof(xFixed));
if (!new_params) if (!new_params)
return FALSE; return FALSE;
memcpy(new_params, params, nparams * sizeof(xFixed)); memcpy(new_params, params, nparams * sizeof(xFixed));