SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: rename join() to strjoin()

Browse Source 
This is to match strappend() and the other string related functions.
This commit is contained in:
Lennart Poettering
2012-07-13 13:41:01 +02:00
parent 184850e8a7
commit b7def68494
24 changed files with 62 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cryptsetup/cryptsetup-generator.c
+5 -5
View File
@@ -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;