diff --git a/src/knot/server/journal.c b/src/knot/server/journal.c index 0e102134ed94a65cd6711b419f9c1415cfdcdcbc..5f68ce7006c230b5e0c38b36d174ea7d9005fefd 100644 --- a/src/knot/server/journal.c +++ b/src/knot/server/journal.c @@ -43,8 +43,7 @@ /*! \bref Starting node data position. */ #define jnode_base_pos(max_nodes) (JOURNAL_HSIZE + (max_nodes + 1) * sizeof(journal_node_t)) -typedef uint32_t crc_t; -static const crc_t CRC_PLACEHOLDER = 0; +static const uint32_t CRC_PLACEHOLDER = 0; static inline int sfread(void *dst, size_t len, int fd) { @@ -245,7 +244,7 @@ static int journal_open_file(journal_t *j) } /* Skip CRC */ - if (lseek(j->fd, MAGIC_LENGTH + sizeof(crc_t), SEEK_SET) < 0) { + if (lseek(j->fd, MAGIC_LENGTH + sizeof(CRC_PLACEHOLDER), SEEK_SET) < 0) { goto open_file_error; } diff --git a/src/knot/server/journal.h b/src/knot/server/journal.h index 8c788b4d08e83b58fcec802803bae9414d67ebb2..97abc509ef2747870e60cd02c199c6367ef81de0 100644 --- a/src/knot/server/journal.h +++ b/src/knot/server/journal.h @@ -103,7 +103,7 @@ typedef struct journal_t #define JOURNAL_MAGIC {'k', 'n', 'o', 't', '1', '5', '2'} #define MAGIC_LENGTH 7 /* HEADER = magic, crc, max_entries, qhead, qtail */ -#define JOURNAL_HSIZE (MAGIC_LENGTH + sizeof(crc_t) + sizeof(uint16_t) * 3) +#define JOURNAL_HSIZE (MAGIC_LENGTH + sizeof(uint32_t) + sizeof(uint16_t) * 3) /*! * \brief Open journal.