summaryrefslogtreecommitdiff
path: root/src/cryptsetup/cryptsetup-generator.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/cryptsetup/cryptsetup-generator.c
parent184850e8a741beb795f6ea66091f3fb176fce880 (diff)
util: rename join() to strjoin()
This is to match strappend() and the other string related functions.
Diffstat (limited to 'src/cryptsetup/cryptsetup-generator.c')
-rw-r--r--src/cryptsetup/cryptsetup-generator.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index f714c8c241..7801de64b5 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -88,7 +88,7 @@ static int create_disk(
goto fail;
}
- p = join(arg_dest, "/", n, NULL);
+ p = strjoin(arg_dest, "/", n, NULL);
if (!p) {
r = -ENOMEM;
log_error("Failed to allocate unit file name.");
@@ -175,7 +175,7 @@ static int create_disk(
if (!noauto) {
- to = join(arg_dest, "/", d, ".wants/", n, NULL);
+ to = strjoin(arg_dest, "/", d, ".wants/", n, NULL);
if (!to) {
r = -ENOMEM;
goto fail;
@@ -191,9 +191,9 @@ static int create_disk(
free(to);
if (!nofail)
- to = join(arg_dest, "/cryptsetup.target.requires/", n, NULL);
+ to = strjoin(arg_dest, "/cryptsetup.target.requires/", n, NULL);
else
- to = join(arg_dest, "/cryptsetup.target.wants/", n, NULL);
+ to = strjoin(arg_dest, "/cryptsetup.target.wants/", n, NULL);
if (!to) {
r = -ENOMEM;
goto fail;
@@ -211,7 +211,7 @@ static int create_disk(
}
e = unit_name_escape(name);
- to = join(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
+ to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
if (!to) {
r = -ENOMEM;
goto fail;