util: introduce save_argc_argv() helper

diff --git a/src/basic/util.h b/src/basic/util.h
index 0d40db059abdb9ddd23f0d0f3290ffe90049c8c3..412563fa8e7576318e8cc71b9edaeb4ba55e5a81 100644 (file)
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -46,6 +46,11 @@ static inline const char* enable_disable(bool b) {
 extern int saved_argc;
 extern char **saved_argv;
 
+static inline void save_argc_argv(int argc, char **argv) {
+        saved_argc = argc;
+        saved_argv = argv;
+}
+
 bool kexec_loaded(void);
 
 int prot_from_flags(int flags) _const_;

diff --git a/src/core/main.c b/src/core/main.c
index 981513bbc3b74acadbe5f31aace01e4c353bee6f..6f6f4e5c5e5e875dc1d21077b33f5d5d3038886d 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -2380,8 +2380,7 @@ int main(int argc, char *argv[]) {
         (void) prctl(PR_SET_NAME, systemd);
 
         /* Save the original command line */
-        saved_argv = argv;
-        saved_argc = argc;
+        save_argc_argv(argc, argv);
 
         /* Make sure that if the user says "syslog" we actually log to the journal. */
         log_set_upgrade_syslog_to_journal(true);

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index f3842f70c65106459d3a29fe6de1ff3a32278a4d..19eb5b6016ae727b631fd87596da04883626d531 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -4668,8 +4668,7 @@ static int run(int argc, char *argv[]) {
         log_open();
 
         /* Make sure rename_process() in the stub init process can work */
-        saved_argv = argv;
-        saved_argc = argc;
+        save_argc_argv(argc, argv);
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index b5ba651d8935ebbb75169a9f829f5cdec4db8aab..89f6618e2e85280bb1ea6a9ceb4eeae5e001fafc 100644 (file)
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -603,8 +603,7 @@ static void test_ioprio_class_from_to_string(void) {
 int main(int argc, char *argv[]) {
         test_setup_logging(LOG_DEBUG);
 
-        saved_argc = argc;
-        saved_argv = argv;
+        save_argc_argv(argc, argv);
 
         if (argc > 1) {
                 pid_t pid = 0;