X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-def.h;h=ac5611c310538aecd7755ba465e3dd3f7aaee362;hb=33b40551236a6c0c323226b78f1b1e5751a95ff5;hp=52c55ab4bb4dc72d8725e4812c413715d4ba65d0;hpb=baed47c3c20512507e497058d388782400a072f6;p=elogind.git

diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
index 52c55ab4b..ac5611c31 100644
--- a/src/journal/journal-def.h
+++ b/src/journal/journal-def.h
@@ -27,6 +27,13 @@
 
 #include "macro.h"
 
+/*
+ * If you change this file you probably should also change its documentation:
+ *
+ * http://www.freedesktop.org/wiki/Software/systemd/journal-files
+ *
+ */
+
 typedef struct Header Header;
 
 typedef struct ObjectHeader ObjectHeader;
@@ -47,12 +54,12 @@ typedef struct FSSHeader FSSHeader;
 /* Object types */
 enum {
         OBJECT_UNUSED,
-        OBJECT_DATA,               /* !!! */
+        OBJECT_DATA,
         OBJECT_FIELD,
         OBJECT_ENTRY,
         OBJECT_DATA_HASH_TABLE,
         OBJECT_FIELD_HASH_TABLE,
-        OBJECT_ENTRY_ARRAY,        /* !!! */
+        OBJECT_ENTRY_ARRAY,
         OBJECT_TAG,
         _OBJECT_TYPE_MAX
 };
@@ -124,8 +131,8 @@ _packed_ struct EntryArrayObject {
 
 _packed_ struct TagObject {
         ObjectHeader object;
-        uint64_t seqnum;
-        uint64_t epoch;
+        le64_t seqnum;
+        le64_t epoch;
         uint8_t tag[TAG_LENGTH]; /* SHA-256 HMAC */
 };
 
@@ -140,9 +147,10 @@ union Object {
 };
 
 enum {
-        STATE_OFFLINE,
-        STATE_ONLINE,
-        STATE_ARCHIVED
+        STATE_OFFLINE = 0,
+        STATE_ONLINE = 1,
+        STATE_ARCHIVED = 2,
+        _STATE_MAX
 };
 
 /* Header flags */
@@ -168,9 +176,9 @@ _packed_ struct Header {
         sd_id128_t seqnum_id;
         le64_t header_size;
         le64_t arena_size;
-        le64_t data_hash_table_offset;     /* for looking up data objects */
+        le64_t data_hash_table_offset;
         le64_t data_hash_table_size;
-        le64_t field_hash_table_offset;     /* for looking up field objects */
+        le64_t field_hash_table_offset;
         le64_t field_hash_table_size;
         le64_t tail_object_offset;
         le64_t n_objects;
@@ -187,6 +195,8 @@ _packed_ struct Header {
         /* Added in 189 */
         le64_t n_tags;
         le64_t n_entry_arrays;
+
+        /* Size: 224 */
 };
 
 #define FSS_HEADER_SIGNATURE ((char[]) { 'K', 'S', 'H', 'H', 'R', 'H', 'L', 'P' })