diff options
-rw-r--r-- | src/journal/journal-authenticate.c | 2 | ||||
-rw-r--r-- | src/journal/journal-authenticate.h | 2 | ||||
-rw-r--r-- | src/journal/journal-def.h | 4 | ||||
-rw-r--r-- | src/journal/journal-file.c | 6 | ||||
-rw-r--r-- | src/journal/journal-file.h | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c index 0e31c8dc91..b3e2601c4e 100644 --- a/src/journal/journal-authenticate.c +++ b/src/journal/journal-authenticate.c @@ -229,7 +229,7 @@ int journal_file_maybe_append_tag(JournalFile *f, uint64_t realtime) { return 0; } -int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p) { +int journal_file_hmac_put_object(JournalFile *f, ObjectType type, Object *o, uint64_t p) { int r; assert(f); diff --git a/src/journal/journal-authenticate.h b/src/journal/journal-authenticate.h index 0aaf836721..565fe8432c 100644 --- a/src/journal/journal-authenticate.h +++ b/src/journal/journal-authenticate.h @@ -33,7 +33,7 @@ int journal_file_append_first_tag(JournalFile *f); int journal_file_hmac_setup(JournalFile *f); int journal_file_hmac_start(JournalFile *f); int journal_file_hmac_put_header(JournalFile *f); -int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p); +int journal_file_hmac_put_object(JournalFile *f, ObjectType type, Object *o, uint64_t p); int journal_file_fss_load(JournalFile *f); int journal_file_parse_verification_key(JournalFile *f, const char *key); diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h index 005e5fa149..ab089cb966 100644 --- a/src/journal/journal-def.h +++ b/src/journal/journal-def.h @@ -52,7 +52,7 @@ typedef struct HashItem HashItem; typedef struct FSSHeader FSSHeader; /* Object types */ -enum { +typedef enum ObjectType { OBJECT_UNUSED, /* also serves as "any type" or "additional context" */ OBJECT_DATA, OBJECT_FIELD, @@ -62,7 +62,7 @@ enum { OBJECT_ENTRY_ARRAY, OBJECT_TAG, _OBJECT_TYPE_MAX -}; +} ObjectType; /* Object flags */ enum { diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 6ee0fff04c..1d73be1a2a 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -374,7 +374,7 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) return 0; } -static unsigned type_to_context(int type) { +static unsigned type_to_context(ObjectType type) { /* One context for each type, plus one catch-all for the rest */ return type > OBJECT_UNUSED && type < _OBJECT_TYPE_MAX ? type : 0; } @@ -417,7 +417,7 @@ static uint64_t minimum_header_size(Object *o) { return table[o->object.type]; } -int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Object **ret) { +int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset, Object **ret) { int r; void *t; Object *o; @@ -487,7 +487,7 @@ static uint64_t journal_file_entry_seqnum(JournalFile *f, uint64_t *seqnum) { return r; } -int journal_file_append_object(JournalFile *f, int type, uint64_t size, Object **ret, uint64_t *offset) { +int journal_file_append_object(JournalFile *f, ObjectType type, uint64_t size, Object **ret, uint64_t *offset) { int r; uint64_t p; Object *tail, *o; diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h index 5e8065c5a0..a4a172b500 100644 --- a/src/journal/journal-file.h +++ b/src/journal/journal-file.h @@ -160,13 +160,13 @@ static inline bool VALID_EPOCH(uint64_t u) { #define JOURNAL_HEADER_COMPRESSED_LZ4(h) \ (!!(le32toh((h)->incompatible_flags) & HEADER_INCOMPATIBLE_COMPRESSED_LZ4)) -int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Object **ret); +int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset, Object **ret); uint64_t journal_file_entry_n_items(Object *o) _pure_; uint64_t journal_file_entry_array_n_items(Object *o) _pure_; uint64_t journal_file_hash_table_n_items(Object *o) _pure_; -int journal_file_append_object(JournalFile *f, int type, uint64_t size, Object **ret, uint64_t *offset); +int journal_file_append_object(JournalFile *f, ObjectType type, uint64_t size, Object **ret, uint64_t *offset); int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, uint64_t *seqno, Object **ret, uint64_t *offset); int journal_file_find_data_object(JournalFile *f, const void *data, uint64_t size, Object **ret, uint64_t *offset); |