X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fcatalog.c;h=3735ad9213d041712a7da91a56baf98b2ba4b799;hb=67e04a486b92fcb656049cb4d6b66148c7d2e61b;hp=22029da8518893ef0197e5bfc489addf49a0598c;hpb=7c670f5b44a6e8758918eaacd59f472ee7942514;p=elogind.git

diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 22029da85..3735ad921 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -269,7 +269,6 @@ static int import_file(Hashmap *h, struct strbuf *sb, const char *path) {
         return 0;
 }
 
-#define CATALOG_PATH "/var/lib/systemd/catalog"
 #define CATALOG_DATABASE CATALOG_PATH "/database"
 
 int catalog_update(void) {
@@ -384,7 +383,7 @@ int catalog_update(void) {
                 goto finish;
         }
 
-        log_debug("%s: wrote %u items, with %zu bytes of strings, %zu total size.",
+        log_debug("%s: wrote %u items, with %zu bytes of strings, %ld total size.",
                  CATALOG_DATABASE, n, sb->len, ftell(w));
 
         free(p);
@@ -414,7 +413,7 @@ static int open_mmap(int *_fd, struct stat *_st, void **_p) {
         assert(_st);
         assert(_p);
 
-        fd = open("/var/lib/systemd/catalog/database", O_RDONLY|O_CLOEXEC);
+        fd = open(CATALOG_DATABASE, O_RDONLY|O_CLOEXEC);
         if (fd < 0)
                 return -errno;