summaryrefslogtreecommitdiffstats
path: root/src/journal-remote/journal-remote-main.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2022-03-24 14:04:40 +0100
committerLennart Poettering <lennart@poettering.net>2022-03-25 09:59:09 +0100
commit49615dbd8191e2b898496c5a90fdb35f92d4fdb9 (patch)
tree38d63d34e959aee2896594dadfb121033aea4cbd /src/journal-remote/journal-remote-main.c
parentjournal-remote: constify a few parameters (diff)
downloadsystemd-49615dbd8191e2b898496c5a90fdb35f92d4fdb9.tar.xz
systemd-49615dbd8191e2b898496c5a90fdb35f92d4fdb9.zip
journal-file: merge compress/seal bool args into a single flags param
Just some modernization/refactoring. No change in behaviour, just let's do how we do things these days: use flags param instead of list of bools.
Diffstat (limited to 'src/journal-remote/journal-remote-main.c')
-rw-r--r--src/journal-remote/journal-remote-main.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index beb73f3572..7c3c9ff44a 100644
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -223,9 +223,7 @@ static int process_http_upload(
finished = true;
for (;;) {
- r = process_source(source,
- journal_remote_server_global->compress,
- journal_remote_server_global->seal);
+ r = process_source(source, journal_remote_server_global->file_flags);
if (r == -EAGAIN)
break;
if (r < 0) {
@@ -599,7 +597,12 @@ static int create_remoteserver(
int r, n, fd;
- r = journal_remote_server_init(s, arg_output, arg_split_mode, arg_compress, arg_seal);
+ r = journal_remote_server_init(
+ s,
+ arg_output,
+ arg_split_mode,
+ (arg_compress ? JOURNAL_COMPRESS : 0) |
+ (arg_seal ? JOURNAL_SEAL : 0));
if (r < 0)
return r;