diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-03-06 11:41:59 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2019-03-07 15:10:06 +0100 |
| commit | 5432d8a187fb0ffab0eb3095b9f898270dab82ef (patch) | |
| tree | 64d80c7a4554c771594538c20e9b2e4da3924bba | |
| parent | 3f1e2714a44d77493cf5d0d961d150ef6d3c2323 (diff) | |
| download | systemd-5432d8a187fb0ffab0eb3095b9f898270dab82ef.tar.gz | |
catalog: use structured initialization more
| -rw-r--r-- | src/journal/catalog.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/journal/catalog.c b/src/journal/catalog.c index efe86bdef4..af9e9191b1 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c @@ -33,7 +33,7 @@ const char * const catalog_file_dirs[] = { NULL }; -#define CATALOG_SIGNATURE (uint8_t[]) { 'R', 'H', 'H', 'H', 'K', 'S', 'L', 'P' } +#define CATALOG_SIGNATURE { 'R', 'H', 'H', 'H', 'K', 'S', 'L', 'P' } typedef struct CatalogHeader { uint8_t signature[8]; /* "RHHHKSLP" */ @@ -392,11 +392,12 @@ static int64_t write_catalog( return log_error_errno(r, "Failed to open database for writing: %s: %m", database); - zero(header); - memcpy(header.signature, CATALOG_SIGNATURE, sizeof(header.signature)); - header.header_size = htole64(ALIGN_TO(sizeof(CatalogHeader), 8)); - header.catalog_item_size = htole64(sizeof(CatalogItem)); - header.n_items = htole64(n); + header = (CatalogHeader) { + .signature = CATALOG_SIGNATURE, + .header_size = htole64(ALIGN_TO(sizeof(CatalogHeader), 8)), + .catalog_item_size = htole64(sizeof(CatalogItem)), + .n_items = htole64(n), + }; r = -EIO; @@ -537,7 +538,7 @@ static int open_mmap(const char *database, int *_fd, struct stat *_st, void **_p } h = p; - if (memcmp(h->signature, CATALOG_SIGNATURE, sizeof(h->signature)) != 0 || + if (memcmp(h->signature, (const uint8_t[]) CATALOG_SIGNATURE, sizeof(h->signature)) != 0 || le64toh(h->header_size) < sizeof(CatalogHeader) || le64toh(h->catalog_item_size) < sizeof(CatalogItem) || h->incompatible_flags != 0 || |