summaryrefslogtreecommitdiff
path: root/src/shared/install.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-11-03 13:59:20 -0600
committerGitHub <noreply@github.com>2016-11-03 13:59:20 -0600
commit493fd52f1ada36bfe63301d4bb50f7fd2b38c670 (patch)
tree19864f5568a2fe48181c1b3f33c46b4db36dd768 /src/shared/install.c
parenta1e2ef7ec912902d8142e7cb5830cbfb47dba86c (diff)
parent9aa2169eaeb20994fb2b0196c051cff52f57a93d (diff)
Merge pull request #4510 from keszybz/tree-wide-cleanups
Tree wide cleanups
Diffstat (limited to 'src/shared/install.c')
-rw-r--r--src/shared/install.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/install.c b/src/shared/install.c
index 96fba6e25b..474426d927 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1307,7 +1307,7 @@ static int unit_file_search(
STRV_FOREACH(p, paths->search_path) {
_cleanup_free_ char *path = NULL;
- path = strjoin(*p, "/", info->name, NULL);
+ path = strjoin(*p, "/", info->name);
if (!path)
return -ENOMEM;
@@ -1332,7 +1332,7 @@ static int unit_file_search(
STRV_FOREACH(p, paths->search_path) {
_cleanup_free_ char *path = NULL;
- path = strjoin(*p, "/", template, NULL);
+ path = strjoin(*p, "/", template);
if (!path)
return -ENOMEM;
@@ -1612,7 +1612,7 @@ static int install_info_symlink_wants(
continue;
}
- path = strjoin(config_path, "/", dst, suffix, n, NULL);
+ path = strjoin(config_path, "/", dst, suffix, n);
if (!path)
return -ENOMEM;
@@ -1646,7 +1646,7 @@ static int install_info_symlink_link(
if (r > 0)
return 0;
- path = strjoin(config_path, "/", i->name, NULL);
+ path = strjoin(config_path, "/", i->name);
if (!path)
return -ENOMEM;
@@ -2166,7 +2166,7 @@ int unit_file_revert(
STRV_FOREACH(j, fs) {
_cleanup_free_ char *t = NULL;
- t = strjoin(*i, "/", *j, NULL);
+ t = strjoin(*i, "/", *j);
if (!t)
return -ENOMEM;