From f550afcd58691ba21bd3bd4a89c76e3d4a4d59a8 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 8 May 2024 17:36:00 +0200
Subject: [PATCH] (submit/cleanup-alloc-funcs) 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>
---
 hw/xfree86/common/xf86Bus.c    | 2 +-
 hw/xfree86/common/xf86Xinput.c | 6 +++---
 hw/xfree86/common/xf86pciBus.c | 2 +-
 hw/xfree86/loader/loadmod.c    | 2 +-
 hw/xfree86/modes/xf86Modes.c   | 2 +-
 hw/xwayland/xwayland-xtest.c   | 2 +-
 xkb/xkbUtils.c                 | 6 +++---
 7 files changed, 11 insertions(+), 11 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 e2b7b9b66..239fe9939 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -719,7 +719,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");
@@ -1046,7 +1046,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;
@@ -1058,7 +1058,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;
diff --git a/hw/xwayland/xwayland-xtest.c b/hw/xwayland/xwayland-xtest.c
index c4165853f..da303a7ad 100644
--- a/hw/xwayland/xwayland-xtest.c
+++ b/hw/xwayland/xwayland-xtest.c
@@ -361,7 +361,7 @@ setup_ei(ClientPtr client)
     }
 
     xwl_ei_client = calloc(1, sizeof *xwl_ei_client);
-    xwl_ei_client->cmdline = xstrdup(cmdname);
+    xwl_ei_client->cmdline = Xstrdup(cmdname);
     if (!xwl_ei_client) {
         error_ei("OOM, cannot setup EI\n");
         goto out;
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index cdd5eb004..7ad50fc2f 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -1466,8 +1466,8 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
                     strcpy(dprop->value, sprop->value);
                 }
                 else {
-                    dprop->name = xstrdup(sprop->name);
-                    dprop->value = xstrdup(sprop->value);
+                    dprop->name = Xstrdup(sprop->name);
+                    dprop->value = Xstrdup(sprop->value);
                 }
             }
 
@@ -1520,7 +1520,7 @@ _XkbCopyGeom(XkbDescPtr src, XkbDescPtr dst)
                     strcpy(dcolor->spec, scolor->spec);
                 }
                 else {
-                    dcolor->spec = xstrdup(scolor->spec);
+                    dcolor->spec = Xstrdup(scolor->spec);
                 }
                 dcolor->pixel = scolor->pixel;
             }