From 853be450bb95cb7b022f6dad4263e4a92bf18e4b Mon Sep 17 00:00:00 2001
From: Craig Barnes <craigbarnes@protonmail.com>
Date: Sat, 16 Mar 2024 20:17:53 +0000
Subject: [PATCH] main/config: replace some uses of xasprintf() with xstrjoin()

---
 config.c | 8 ++++----
 main.c   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config.c b/config.c
index ab0e2927..ff92cb46 100644
--- a/config.c
+++ b/config.c
@@ -355,9 +355,9 @@ open_config(void)
 
     /* First, check XDG_CONFIG_HOME (or .config, if unset) */
     if (xdg_config_home != NULL && xdg_config_home[0] != '\0')
-        path = xasprintf("%s/foot/foot.ini", xdg_config_home);
+        path = xstrjoin(xdg_config_home, "/foot/foot.ini");
     else if (home_dir != NULL)
-        path = xasprintf("%s/.config/foot/foot.ini", home_dir);
+        path = xstrjoin(home_dir, "/.config/foot/foot.ini");
 
     if (path != NULL) {
         LOG_DBG("checking for %s", path);
@@ -382,7 +382,7 @@ open_config(void)
          conf_dir = strtok(NULL, ":"))
     {
         free(path);
-        path = xasprintf("%s/foot/foot.ini", conf_dir);
+        path = xstrjoin(conf_dir, "/foot/foot.ini");
 
         LOG_DBG("checking for %s", path);
         int fd = open(path, O_RDONLY | O_CLOEXEC);
@@ -2861,7 +2861,7 @@ get_server_socket_path(void)
 
     const char *wayland_display = getenv("WAYLAND_DISPLAY");
     if (wayland_display == NULL) {
-        return xasprintf("%s/foot.sock", xdg_runtime);
+        return xstrjoin(xdg_runtime, "/foot.sock");
     }
 
     return xasprintf("%s/foot-%s.sock", xdg_runtime, wayland_display);
diff --git a/main.c b/main.c
index 24ba45ca..207e6eb7 100644
--- a/main.c
+++ b/main.c
@@ -261,7 +261,7 @@ main(int argc, char *const *argv)
             break;
 
         case 't':
-            tll_push_back(overrides, xasprintf("term=%s", optarg));
+            tll_push_back(overrides, xstrjoin("term=", optarg));
             break;
 
         case 'L':
@@ -269,11 +269,11 @@ main(int argc, char *const *argv)
             break;
 
         case 'T':
-            tll_push_back(overrides, xasprintf("title=%s", optarg));
+            tll_push_back(overrides, xstrjoin("title=", optarg));
             break;
 
         case 'a':
-            tll_push_back(overrides, xasprintf("app-id=%s", optarg));
+            tll_push_back(overrides, xstrjoin("app-id=", optarg));
             break;
 
         case 'D': {
@@ -287,7 +287,7 @@ main(int argc, char *const *argv)
         }
 
         case 'f': {
-            char *font_override = xasprintf("font=%s", optarg);
+            char *font_override = xstrjoin("font=", optarg);
             tll_push_back(overrides, font_override);
             break;
         }