tree-wide: get rid of strappend()

It's a special case of strjoin(), so no need to keep both. In particular
as typing strjoin() is even shoert than strappend().

8 files changed, 11 insertions, 9 deletions

diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index d2f4e60f98..2e13e4aed6 100644
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -222,7 +222,7 @@ int devnode_acl_all(const char *seat,
                         if (cunescape(dent->d_name, UNESCAPE_RELAX, &unescaped_devname) < 0)
                                 return -ENOMEM;
 
-                        n = strappend("/dev/", unescaped_devname);
+                        n = path_join("/dev", unescaped_devname);
                         if (!n)
                                 return -ENOMEM;
 
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 1f5bdfecfc..b7c6e00e95 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1322,7 +1322,7 @@ static int trigger_device(Manager *m, sd_device *d) {
                 if (r < 0)
                         return r;
 
-                t = strappend(p, "/uevent");
+                t = path_join(p, "uevent");
                 if (!t)
                         return -ENOMEM;
 
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index d963706dce..d32e299101 100644
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -17,6 +17,7 @@
 #include "logind-inhibit.h"
 #include "mkdir.h"
 #include "parse-util.h"
+#include "path-util.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "tmpfile-util.h"
@@ -32,7 +33,7 @@ Inhibitor* inhibitor_new(Manager *m, const char* id) {
         if (!i)
                 return NULL;
 
-        i->state_file = strappend("/run/systemd/inhibit/", id);
+        i->state_file = path_join("/run/systemd/inhibit", id);
         if (!i->state_file)
                 return mfree(i);
 
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index c33a0e0ad4..3c58929611 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -304,7 +304,7 @@ char *seat_bus_path(Seat *s) {
         if (!t)
                 return NULL;
 
-        return strappend("/org/freedesktop/login1/seat/", t);
+        return strjoin("/org/freedesktop/login1/seat/", t);
 }
 
 int seat_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index c3ad5f9b5b..9577ff86f4 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -19,6 +19,7 @@
 #include "logind-session-dbus.h"
 #include "mkdir.h"
 #include "parse-util.h"
+#include "path-util.h"
 #include "stdio-util.h"
 #include "string-util.h"
 #include "terminal-util.h"
@@ -44,7 +45,7 @@ int seat_new(Seat** ret, Manager *m, const char *id) {
                 .manager = m,
         };
 
-        s->state_file = strappend("/run/systemd/seats/", id);
+        s->state_file = path_join("/run/systemd/seats", id);
         if (!s->state_file)
                 return -ENOMEM;
 
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index c297f62cdf..fc194a3e72 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -634,7 +634,7 @@ char *session_bus_path(Session *s) {
         if (!t)
                 return NULL;
 
-        return strappend("/org/freedesktop/login1/session/", t);
+        return strjoin("/org/freedesktop/login1/session/", t);
 }
 
 int session_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error) {
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 17700c6921..f78453736d 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -67,7 +67,7 @@ int session_new(Session **ret, Manager *m, const char *id) {
                 .tty_validity = _TTY_VALIDITY_INVALID,
         };
 
-        s->state_file = strappend("/run/systemd/sessions/", id);
+        s->state_file = path_join("/run/systemd/sessions", id);
         if (!s->state_file)
                 return -ENOMEM;
 
@@ -899,7 +899,7 @@ static int get_tty_atime(const char *tty, usec_t *atime) {
         assert(atime);
 
         if (!path_is_absolute(tty)) {
-                p = strappend("/dev/", tty);
+                p = path_join("/dev", tty);
                 if (!p)
                         return -ENOMEM;
 
diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
index a41d83b897..9104e023e8 100644
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -109,7 +109,7 @@ static int show_sysfs_one(
                 if (++(*i_dev) < n_dev) {
                         _cleanup_free_ char *p = NULL;
 
-                        p = strappend(prefix, lookahead < n_dev ? special_glyph(SPECIAL_GLYPH_TREE_VERTICAL) : "  ");
+                        p = strjoin(prefix, lookahead < n_dev ? special_glyph(SPECIAL_GLYPH_TREE_VERTICAL) : "  ");
                         if (!p)
                                 return -ENOMEM;