From b7def684941808600c344f0be7a2b9fcdda97e0f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 13 Jul 2012 13:41:01 +0200
Subject: util: rename join() to strjoin()

This is to match strappend() and the other string related functions.
---
 src/delta/delta.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/delta')

diff --git a/src/delta/delta.c b/src/delta/delta.c
index 01c6335315..eef6536b01 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -192,7 +192,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, const char *path) {
                 if (!dirent_is_file(de))
                         continue;
 
-                p = join(path, "/", de->d_name, NULL);
+                p = strjoin(path, "/", de->d_name, NULL);
                 if (!p) {
                         r = -ENOMEM;
                         goto finish;
@@ -254,7 +254,7 @@ static int process_suffix(const char *prefixes, const char *suffix) {
         NULSTR_FOREACH(p, prefixes) {
                 char *t;
 
-                t = join(p, "/", suffix, NULL);
+                t = strjoin(p, "/", suffix, NULL);
                 if (!t) {
                         r = -ENOMEM;
                         goto finish;
-- 
cgit v1.2.3-54-g00ecf