summaryrefslogtreecommitdiff
path: root/src/delta/delta.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-07-13 13:41:01 +0200
committerLennart Poettering <lennart@poettering.net>2012-07-13 13:41:01 +0200
commitb7def684941808600c344f0be7a2b9fcdda97e0f (patch)
treed28516d55a035ae9f754cb21e6d97eb3d0e21e27 /src/delta/delta.c
parent184850e8a741beb795f6ea66091f3fb176fce880 (diff)
util: rename join() to strjoin()
This is to match strappend() and the other string related functions.
Diffstat (limited to 'src/delta/delta.c')
-rw-r--r--src/delta/delta.c4
1 files changed, 2 insertions, 2 deletions
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;