dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-04 23:20:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmspawn: trivial cleanups for start_systemd_journal_remote()

Browse Source 
- prefix argument for storing result with 'ret_',
- align arguments for strv_new().
This commit is contained in:
Yu Watanabe
2024-05-10 11:27:48 +09:00
parent 41a94ae670
commit f607dd58bd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vmspawn/vmspawn.c
View File

@@ -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;
}