fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 12:50:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

treewide: replace xnfrealloc() calls to XNFrealloc()

Browse source 
This has been nothing but an alias for two decades now (somewhere in R6.6),
so there doesn't seem to be any practical need for this indirection.

The macro still needs to remain, as long as (external) drivers still using it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1529>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-05-08 17:31:28 +02:00 • committed by Marge Bot
parent 61233adbca
commit a1fd7e7ba5
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dix/dixutils.c
View file

@ -800,7 +800,7 @@ CreateCallbackList(CallbackListPtr *pcbl)
} }
} }
listsToCleanup = (CallbackListPtr **) xnfrealloc(listsToCleanup, listsToCleanup = (CallbackListPtr **) XNFrealloc(listsToCleanup,
sizeof(CallbackListPtr *) * sizeof(CallbackListPtr *) *
(numCallbackListsToCleanup (numCallbackListsToCleanup
+ 1)); + 1));

2
hw/xfree86/common/xf86Helper.c
View file

@ -1339,7 +1339,7 @@ xf86MatchDevice(const char *drivername, GDevPtr ** sectlist)
/* /*
* we have a matching driver that wasn't claimed, yet * we have a matching driver that wasn't claimed, yet
*/ */
pgdp = xnfrealloc(pgdp, (i + 2) * sizeof(GDevPtr)); pgdp = XNFrealloc(pgdp, (i + 2) * sizeof(GDevPtr));
pgdp[i++] = screensecptr->gpu_devices[k]; pgdp[i++] = screensecptr->gpu_devices[k];
} }
} }

2
hw/xfree86/modes/xf86Modes.c
View file

@ -288,7 +288,7 @@ xf86ModesEqual(const DisplayModeRec * pMode1, const DisplayModeRec * pMode2)
static void static void
add(char **p, const char *new) add(char **p, const char *new)
{ {
*p = xnfrealloc(*p, strlen(*p) + strlen(new) + 2); *p = XNFrealloc(*p, strlen(*p) + strlen(new) + 2);
strcat(*p, " "); strcat(*p, " ");
strcat(*p, new); strcat(*p, new);
} }

6
hw/xwayland/xwayland-dmabuf.c
View file

@ -410,7 +410,7 @@ xwl_add_format_and_mod_to_list(struct xwl_format **formats,
if (xwl_format == NULL) { if (xwl_format == NULL) {
(*num_formats)++; (*num_formats)++;
*formats = xnfrealloc(*formats, *num_formats * sizeof(*xwl_format)); *formats = XNFrealloc(*formats, *num_formats * sizeof(*xwl_format));
xwl_format = &(*formats)[*num_formats - 1]; xwl_format = &(*formats)[*num_formats - 1];
xwl_format->format = format; xwl_format->format = format;
xwl_format->num_modifiers = 0; xwl_format->num_modifiers = 0;
@ -424,7 +424,7 @@ xwl_add_format_and_mod_to_list(struct xwl_format **formats,
} }
xwl_format->num_modifiers++; xwl_format->num_modifiers++;
xwl_format->modifiers = xnfrealloc(xwl_format->modifiers, xwl_format->modifiers = XNFrealloc(xwl_format->modifiers,
xwl_format->num_modifiers * sizeof(uint64_t)); xwl_format->num_modifiers * sizeof(uint64_t));
xwl_format->modifiers[xwl_format->num_modifiers - 1] = modifier; xwl_format->modifiers[xwl_format->num_modifiers - 1] = modifier;
} }
@ -596,7 +596,7 @@ xwl_dmabuf_feedback_tranche_done(void *data,
if (!appended) { if (!appended) {
xwl_feedback->dev_formats_len++; xwl_feedback->dev_formats_len++;
xwl_feedback->dev_formats = xnfrealloc(xwl_feedback->dev_formats, xwl_feedback->dev_formats = XNFrealloc(xwl_feedback->dev_formats,
sizeof(struct xwl_device_formats) * sizeof(struct xwl_device_formats) *
xwl_feedback->dev_formats_len); xwl_feedback->dev_formats_len);