diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-04-17 15:30:48 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-04-24 07:44:42 +0200 |
| commit | 41ab8c67ebfbbdc78cda473d81d392da912c17bc (patch) | |
| tree | 17a5c1e1a37023f1c0b7b5d49c33d0e4989a9123 /src/journal/journalctl.c | |
| parent | 2efa5bc6fac6ab935941757993ca187de8d503fc (diff) | |
| download | systemd-41ab8c67ebfbbdc78cda473d81d392da912c17bc.tar.gz | |
tree-wide: use structured initialization at various places
Diffstat (limited to 'src/journal/journalctl.c')
| -rw-r--r-- | src/journal/journalctl.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 7dc48fdb63..01d75b0e24 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1783,7 +1783,6 @@ static int setup_keys(void) { int fd = -1, r; sd_id128_t machine, boot; char *p = NULL, *k = NULL; - struct FSSHeader h; uint64_t n; struct stat st; @@ -1873,15 +1872,17 @@ static int setup_keys(void) { if (r < 0) log_warning_errno(r, "Failed to set file attributes: %m"); - zero(h); + struct FSSHeader h = { + .machine_id = machine, + .boot_id = boot, + .header_size = htole64(sizeof(h)), + .start_usec = htole64(n * arg_interval), + .interval_usec = htole64(arg_interval), + .fsprg_secpar = htole16(FSPRG_RECOMMENDED_SECPAR), + .fsprg_state_size = htole64(state_size), + }; + memcpy(h.signature, "KSHHRHLP", 8); - h.machine_id = machine; - h.boot_id = boot; - h.header_size = htole64(sizeof(h)); - h.start_usec = htole64(n * arg_interval); - h.interval_usec = htole64(arg_interval); - h.fsprg_secpar = htole16(FSPRG_RECOMMENDED_SECPAR); - h.fsprg_state_size = htole64(state_size); r = loop_write(fd, &h, sizeof(h), false); if (r < 0) { |