Move all database format definition into format.h

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/database.c b/src/database.c
index e81ea44e2ca5c7ea4cff1d40788f698c945fe789..345b4f7ec272c5b80f811be188b2987369194fde 100644 (file)
--- a/src/database.c
+++ b/src/database.c
@@ -46,16 +46,6 @@ struct loc_database {
        struct loc_stringpool* pool;
 };
 
-const char* LOC_DATABASE_MAGIC = "LOCDBXX";
-unsigned int LOC_DATABASE_VERSION = 0;
-
-struct loc_database_magic {
-       char magic[7];
-
-       // Database version information
-       uint8_t version;
-};
-
 LOC_EXPORT int loc_database_new(struct loc_ctx* ctx, struct loc_database** database, size_t pool_size) {
        struct loc_database* db = calloc(1, sizeof(*db));
        if (!db)

diff --git a/src/loc/format.h b/src/loc/format.h
index deec7f10757bf9b84bfe007470726df2ffa7b675..130d0ff6b732416ad7cb9cda2bda356b0073209a 100644 (file)
--- a/src/loc/format.h
+++ b/src/loc/format.h
@@ -19,6 +19,16 @@
 
 #include <stdint.h>
 
+#define LOC_DATABASE_MAGIC      "LOCDBXX"
+#define LOC_DATABASE_VERSION    0
+
+struct loc_database_magic {
+       char magic[7];
+
+       // Database version information
+       uint8_t version;
+};
+
 struct loc_database_header_v0 {
        // Vendor who created the database
        uint32_t vendor;