From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 11 Jul 2023 21:43:46 +0000 (+0200)
Subject: sysusers: reduce duplication in param list definition
X-Git-Tag: v255-rc1~912^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28e014fed0373d971b45248a9f7ee31b01c0c1cf;p=thirdparty%2Fsystemd.git

sysusers: reduce duplication in param list definition
---

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index cfa4823df71..8acda4ef25e 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -867,13 +867,13 @@ static int write_temporary_gshadow(const char * gshadow_path, FILE **ret_tmpfile
 static int write_files(void) {
         _cleanup_fclose_ FILE *passwd = NULL, *group = NULL, *shadow = NULL, *gshadow = NULL;
         _cleanup_(unlink_and_freep) char *passwd_tmp = NULL, *group_tmp = NULL, *shadow_tmp = NULL, *gshadow_tmp = NULL;
-        const char *passwd_path, *shadow_path, *group_path, *gshadow_path;
         int r;
 
-        passwd_path = prefix_roota(arg_root, "/etc/passwd");
-        shadow_path = prefix_roota(arg_root, "/etc/shadow");
-        group_path = prefix_roota(arg_root, "/etc/group");
-        gshadow_path = prefix_roota(arg_root, "/etc/gshadow");
+        const char
+                *passwd_path = prefix_roota(arg_root, "/etc/passwd"),
+                *shadow_path = prefix_roota(arg_root, "/etc/shadow"),
+                *group_path = prefix_roota(arg_root, "/etc/group"),
+                *gshadow_path = prefix_roota(arg_root, "/etc/gshadow");
 
         r = write_temporary_group(group_path, &group, &group_tmp);
         if (r < 0)