From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 10 May 2024 02:27:48 +0000 (+0900)
Subject: vmspawn: trivial cleanups for start_systemd_journal_remote()
X-Git-Tag: v256-rc2~52^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f607dd58bdfaca1c3c243be04348a1c3787c0d4c;p=thirdparty%2Fsystemd.git

vmspawn: trivial cleanups for start_systemd_journal_remote()

- prefix argument for storing result with 'ret_',
- align arguments for strv_new().
---

diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index 05661961ed0..a5666459a34 100644
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -929,7 +929,7 @@ static int start_tpm(
         return 0;
 }
 
-static int start_systemd_journal_remote(sd_bus *bus, const char *scope, unsigned port, const char *sd_journal_remote, char **listen_address) {
+static int start_systemd_journal_remote(sd_bus *bus, const char *scope, unsigned port, const char *sd_journal_remote, char **ret_listen_address) {
         _cleanup_free_ char *scope_prefix = NULL;
         _cleanup_(socket_service_pair_done) SocketServicePair ssp = {
                 .socket_type = SOCK_STREAM,
@@ -952,7 +952,8 @@ static int start_systemd_journal_remote(sd_bus *bus, const char *scope, unsigned
         if (r < 0)
                 return log_oom();
 
-        ssp.exec_start = strv_new(sd_journal_remote,
+        ssp.exec_start = strv_new(
+                        sd_journal_remote,
                         "--output", arg_forward_journal,
                         "--split-mode", endswith(arg_forward_journal, ".journal") ? "none" : "host");
         if (!ssp.exec_start)
@@ -962,8 +963,8 @@ static int start_systemd_journal_remote(sd_bus *bus, const char *scope, unsigned
         if (r < 0)
                 return r;
 
-        if (listen_address)
-                *listen_address = TAKE_PTR(ssp.listen_address);
+        if (ret_listen_address)
+                *ret_listen_address = TAKE_PTR(ssp.listen_address);
 
         return 0;
 }