From: Mike Yuan <me@yhndnzj.com>
Date: Sun, 27 Apr 2025 17:52:19 +0000 (+0200)
Subject: socket-activate: drop arg_args
X-Git-Tag: v258-rc1~729^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e672795bec23466839e807f01cde1420aaa4ee6;p=thirdparty%2Fsystemd.git

socket-activate: drop arg_args

To follow our usual coding style.
---

diff --git a/src/socket-activate/socket-activate.c b/src/socket-activate/socket-activate.c
index ac663d03238..477f9d66567 100644
--- a/src/socket-activate/socket-activate.c
+++ b/src/socket-activate/socket-activate.c
@@ -29,7 +29,6 @@
 static char **arg_listen = NULL;
 static bool arg_accept = false;
 static int arg_socket_type = SOCK_STREAM;
-static char **arg_args = NULL;
 static char **arg_setenv = NULL;
 static char **arg_fdnames = NULL;
 static bool arg_inetd = false;
@@ -436,8 +435,6 @@ static int parse_argv(int argc, char *argv[]) {
                                        "Datagram sockets do not accept connections. "
                                        "The --datagram and --accept options may not be combined.");
 
-        arg_args = argv + optind;
-
         return 1 /* work to do */;
 }
 
@@ -452,7 +449,7 @@ static int run(int argc, char **argv) {
         if (r <= 0)
                 return r;
 
-        exec_argv = strv_copy(arg_args);
+        exec_argv = strv_copy(argv + optind);
         if (!exec_argv)
                 return log_oom();