tree-wide: replace strjoin() with path_join()

2019-06-21 03:26:16 +09:00
parent f9dc94408d
commit 657ee2d82b
44 changed files with 90 additions and 119 deletions
@@ -4,6 +4,7 @@

 #include "alloc-util.h"
 #include "busctl-introspect.h"
+#include "path-util.h"
 #include "string-util.h"
 #include "util.h"
 #include "xml.h"
@@ -250,10 +251,7 @@ static int parse_xml_node(Context *context, const char *prefix, unsigned n_depth
                                        node_path = TAKE_PTR(name);
                                else {

-                                        if (endswith(prefix, "/"))
-                                                node_path = strappend(prefix, name);
-                                        else
-                                                node_path = strjoin(prefix, "/", name);
+                                        node_path = path_join(prefix, name);
                                        if (!node_path)
                                                return log_oom();
                                }