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

tree-wide: drop NULL sentinel from strjoin

Browse Source 
This makes strjoin and strjoina more similar and avoids the useless final
argument.

spatch -I . -I ./src -I ./src/basic -I ./src/basic -I ./src/shared -I ./src/shared -I ./src/network -I ./src/locale -I ./src/login -I ./src/journal -I ./src/journal -I ./src/timedate -I ./src/timesync -I ./src/nspawn -I ./src/resolve -I ./src/resolve -I ./src/systemd -I ./src/core -I ./src/core -I ./src/libudev -I ./src/udev -I ./src/udev/net -I ./src/udev -I ./src/libsystemd/sd-bus -I ./src/libsystemd/sd-event -I ./src/libsystemd/sd-login -I ./src/libsystemd/sd-netlink -I ./src/libsystemd/sd-network -I ./src/libsystemd/sd-hwdb -I ./src/libsystemd/sd-device -I ./src/libsystemd/sd-id128 -I ./src/libsystemd-network --sp-file coccinelle/strjoin.cocci --in-place $(git ls-files src/*.c)

git grep -e '\bstrjoin\b.*NULL' -l|xargs sed -i -r 's/strjoin\((.*), NULL\)/strjoin(\1)/'

This might have missed a few cases (spatch has a really hard time dealing
with _cleanup_ macros), but that's no big issue, they can always be fixed
later.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2016-10-23 11:43:27 -04:00
parent 3c5d7c978c
commit 605405c6cc
89 changed files with 215 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cryptsetup/cryptsetup-generator.c
+6 -6
View File
@@ -86,7 +86,7 @@ static int create_disk(
if (r < 0)
return log_error_errno(r, "Failed to generate unit name: %m");
p = strjoin(arg_dest, "/", n, NULL);
p = strjoin(arg_dest, "/", n);
if (!p)
return log_oom();
@@ -188,7 +188,7 @@ static int create_disk(
if (!noauto) {
to = strjoin(arg_dest, "/", d, ".wants/", n, NULL);
to = strjoin(arg_dest, "/", d, ".wants/", n);
if (!to)
return log_oom();
@@ -198,9 +198,9 @@ static int create_disk(
free(to);
if (!nofail)
to = strjoin(arg_dest, "/cryptsetup.target.requires/", n, NULL);
to = strjoin(arg_dest, "/cryptsetup.target.requires/", n);
else
to = strjoin(arg_dest, "/cryptsetup.target.wants/", n, NULL);
to = strjoin(arg_dest, "/cryptsetup.target.wants/", n);
if (!to)
return log_oom();
@@ -210,7 +210,7 @@ static int create_disk(
}
free(to);
to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n);
if (!to)
return log_oom();
@@ -220,7 +220,7 @@ static int create_disk(
if (!noauto && !nofail) {
_cleanup_free_ char *dmname;
dmname = strjoin("dev-mapper-", e, ".device", NULL);
dmname = strjoin("dev-mapper-", e, ".device");
if (!dmname)
return log_oom();