diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-10-23 17:43:27 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-10-23 17:43:27 +0200 |
| commit | 605405c6cc934466951b0c6bad5a9553620bcb08 (patch) | |
| tree | af4eb757a0508374d581f746e3ce6a3ca5606dbb /src/sysv-generator/sysv-generator.c | |
| parent | nss-systemd: remove useless define (diff) | |
| download | systemd-605405c6cc934466951b0c6bad5a9553620bcb08.tar.xz systemd-605405c6cc934466951b0c6bad5a9553620bcb08.zip | |
tree-wide: drop NULL sentinel from strjoin
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.
Diffstat (limited to 'src/sysv-generator/sysv-generator.c')
| -rw-r--r-- | src/sysv-generator/sysv-generator.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index c2c80175a2..921fd478d0 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -562,7 +562,7 @@ static int load_sysv(SysvStub *s) { char *d = NULL; if (chkconfig_description) - d = strjoin(chkconfig_description, " ", j, NULL); + d = strjoin(chkconfig_description, " ", j); else d = strdup(j); if (!d) @@ -624,7 +624,7 @@ static int load_sysv(SysvStub *s) { char *d = NULL; if (long_description) - d = strjoin(long_description, " ", t, NULL); + d = strjoin(long_description, " ", t); else d = strdup(j); if (!d) @@ -803,7 +803,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { continue; } - fpath = strjoin(*path, "/", de->d_name, NULL); + fpath = strjoin(*path, "/", de->d_name); if (!fpath) return log_oom(); @@ -849,7 +849,7 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic _cleanup_free_ char *path = NULL; struct dirent *de; - path = strjoin(*p, "/", rcnd_table[i].path, NULL); + path = strjoin(*p, "/", rcnd_table[i].path); if (!path) { r = log_oom(); goto finish; @@ -879,7 +879,7 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic if (a < 0 || b < 0) continue; - fpath = strjoin(*p, "/", de->d_name, NULL); + fpath = strjoin(*p, "/", de->d_name); if (!fpath) { r = log_oom(); goto finish; |