diff options
author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-08 17:36:00 +0200 |
---|---|---|
committer | Marge Bot <emma+marge@anholt.net> | 2024-07-26 23:41:33 +0000 |
commit | 9ec31d1a882549ee26f9b91251ed2d37f979353a (patch) | |
tree | b843cd49fd72457215aaa16b2b4df8b0cfd41e45 /hw/xfree86 | |
parent | a1fd7e7ba5aadc770af8a71edfd152c99fe419d3 (diff) |
treewide: replace strdup() calls to Xstrdup()
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>
Diffstat (limited to 'hw/xfree86')
-rw-r--r-- | hw/xfree86/common/xf86Bus.c | 2 | ||||
-rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 6 | ||||
-rw-r--r-- | hw/xfree86/common/xf86pciBus.c | 2 | ||||
-rw-r--r-- | hw/xfree86/loader/loadmod.c | 2 | ||||
-rw-r--r-- | hw/xfree86/modes/xf86Modes.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 98cbd6d0b..687769c31 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -272,7 +272,7 @@ StringToBusType(const char *busID, const char **retID) return BUS_PCI; } - s = xstrdup(busID); + s = Xstrdup(busID); p = strtok(s, ":"); if (p == NULL || *p == 0) { free(s); diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 482816f48..0c9b97335 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -720,7 +720,7 @@ MergeInputClasses(const InputInfoPtr idev, const InputAttributes * attrs) classopts = xf86optionListDup(cl->option_lst); if (cl->driver) { free((void *) idev->driver); - idev->driver = xstrdup(cl->driver); + idev->driver = Xstrdup(cl->driver); if (!idev->driver) { xf86Msg(X_ERROR, "Failed to allocate memory while merging " "InputClass configuration"); @@ -1047,7 +1047,7 @@ NewInputDeviceRequest(InputOption *options, InputAttributes * attrs, rval = BadRequest; goto unwind; } - pInfo->driver = xstrdup(value); + pInfo->driver = Xstrdup(value); if (!pInfo->driver) { rval = BadAlloc; goto unwind; @@ -1059,7 +1059,7 @@ NewInputDeviceRequest(InputOption *options, InputAttributes * attrs, rval = BadRequest; goto unwind; } - pInfo->name = xstrdup(value); + pInfo->name = Xstrdup(value); if (!pInfo->name) { rval = BadAlloc; goto unwind; diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 586ca9a9d..d2af996da 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -272,7 +272,7 @@ xf86ParsePciBusString(const char *busID, int *bus, int *device, int *func) if (StringToBusType(busID, &id) != BUS_PCI) return FALSE; - s = xstrdup(id); + s = Xstrdup(id); p = strtok(s, ":"); if (p == NULL || *p == 0) { free(s); diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index f8a44827f..fd7afa884 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -733,7 +733,7 @@ LoadModule(const char *module, void *options, const XF86ModReqInfo *modreq, * check the elements in the path */ if (PathIsAbsolute(module)) - found = xstrdup(module); + found = Xstrdup(module); path_elem = pathlist; while (!found && *path_elem != NULL) { found = FindModule(m, *path_elem, patterns); diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c index 0cf1eddac..e8283db0c 100644 --- a/hw/xfree86/modes/xf86Modes.c +++ b/hw/xfree86/modes/xf86Modes.c @@ -681,7 +681,7 @@ xf86GetConfigModes(XF86ConfModeLinePtr conf_mode) mode = calloc(1, sizeof(DisplayModeRec)); if (!mode) continue; - mode->name = xstrdup(conf_mode->ml_identifier); + mode->name = Xstrdup(conf_mode->ml_identifier); if (!mode->name) { free(mode); continue; |