Merge pull request #4510 from keszybz/tree-wide-cleanups

Tree wide cleanups

1 files changed, 12 insertions, 12 deletions

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index a098b27a8e..e64d5bb231 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -76,7 +76,7 @@ static int add_cryptsetup(const char *id, const char *what, bool rw, char **devi
         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();
 
@@ -111,7 +111,7 @@ static int add_cryptsetup(const char *id, const char *what, bool rw, char **devi
 
         from = strjoina("../", n);
 
-        to = strjoin(arg_dest, "/", d, ".wants/", n, NULL);
+        to = strjoin(arg_dest, "/", d, ".wants/", n);
         if (!to)
                 return log_oom();
 
@@ -120,7 +120,7 @@ static int add_cryptsetup(const char *id, const char *what, bool rw, char **devi
                 return log_error_errno(errno, "Failed to create symlink %s: %m", to);
 
         free(to);
-        to = strjoin(arg_dest, "/cryptsetup.target.requires/", n, NULL);
+        to = strjoin(arg_dest, "/cryptsetup.target.requires/", n);
         if (!to)
                 return log_oom();
 
@@ -129,7 +129,7 @@ static int add_cryptsetup(const char *id, const char *what, bool rw, char **devi
                 return log_error_errno(errno, "Failed to create symlink %s: %m", to);
 
         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();
 
@@ -138,7 +138,7 @@ static int add_cryptsetup(const char *id, const char *what, bool rw, char **devi
                 return log_error_errno(errno, "Failed to create symlink %s: %m", to);
 
         free(p);
-        p = strjoin(arg_dest, "/dev-mapper-", e, ".device.d/50-job-timeout-sec-0.conf", NULL);
+        p = strjoin(arg_dest, "/dev-mapper-", e, ".device.d/50-job-timeout-sec-0.conf");
         if (!p)
                 return log_oom();
 
@@ -194,7 +194,7 @@ static int add_mount(
         if (r < 0)
                 return log_error_errno(r, "Failed to generate unit name: %m");
 
-        p = strjoin(arg_dest, "/", unit, NULL);
+        p = strjoin(arg_dest, "/", unit);
         if (!p)
                 return log_oom();
 
@@ -236,7 +236,7 @@ static int add_mount(
                 return log_error_errno(r, "Failed to write unit file %s: %m", p);
 
         if (post) {
-                lnk = strjoin(arg_dest, "/", post, ".requires/", unit, NULL);
+                lnk = strjoin(arg_dest, "/", post, ".requires/", unit);
                 if (!lnk)
                         return log_oom();
 
@@ -340,7 +340,7 @@ static int add_swap(const char *path) {
         if (r < 0)
                 return log_error_errno(r, "Failed to generate unit name: %m");
 
-        unit = strjoin(arg_dest, "/", name, NULL);
+        unit = strjoin(arg_dest, "/", name);
         if (!unit)
                 return log_oom();
 
@@ -361,7 +361,7 @@ static int add_swap(const char *path) {
         if (r < 0)
                 return log_error_errno(r, "Failed to write unit file %s: %m", unit);
 
-        lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
+        lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name);
         if (!lnk)
                 return log_oom();
 
@@ -393,7 +393,7 @@ static int add_automount(
         assert(description);
 
         if (options)
-                opt = strjoin(options, ",noauto", NULL);
+                opt = strjoin(options, ",noauto");
         else
                 opt = strdup("noauto");
         if (!opt)
@@ -414,7 +414,7 @@ static int add_automount(
         if (r < 0)
                 return log_error_errno(r, "Failed to generate unit name: %m");
 
-        p = strjoin(arg_dest, "/", unit, NULL);
+        p = strjoin(arg_dest, "/", unit);
         if (!p)
                 return log_oom();
 
@@ -438,7 +438,7 @@ static int add_automount(
         if (r < 0)
                 return log_error_errno(r, "Failed to write unit file %s: %m", p);
 
-        lnk = strjoin(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/", unit, NULL);
+        lnk = strjoin(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/", unit);
         if (!lnk)
                 return log_oom();
         mkdir_parents_label(lnk, 0755);