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

xi: 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 01d6efb414
commit a222349c43
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xi/getprop.c
View File

@ -116,7 +116,7 @@ ProcXGetDeviceDontPropagateList(ClientPtr client)
ClassFromMask(NULL, others->dontPropagateMask[i], i, &count, COUNT); ClassFromMask(NULL, others->dontPropagateMask[i], i, &count, COUNT);
if (count) { if (count) {
rep.count = count; rep.count = count;
buf = xallocarray(rep.count, sizeof(XEventClass)); buf = calloc(rep.count, sizeof(XEventClass));
rep.length = bytes_to_int32(rep.count * sizeof(XEventClass)); rep.length = bytes_to_int32(rep.count * sizeof(XEventClass));
tbuf = buf; tbuf = buf;

4
Xi/xiproperty.c
View File

@ -222,7 +222,7 @@ list_atoms(DeviceIntPtr dev, int *natoms, Atom **atoms_return)
if (nprops) { if (nprops) {
Atom *a; Atom *a;
atoms = xallocarray(nprops, sizeof(Atom)); atoms = calloc(nprops, sizeof(Atom));
if (!atoms) if (!atoms)
return BadAlloc; return BadAlloc;
a = atoms; a = atoms;
@ -723,7 +723,7 @@ XIChangeDeviceProperty(DeviceIntPtr dev, 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)
XIDestroyDeviceProperty(prop); XIDestroyDeviceProperty(prop);