chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: don't make assumptions about the size of pid_t
[elogind.git]
/
src
/
journal
/
catalog.c
diff --git
a/src/journal/catalog.c
b/src/journal/catalog.c
index ce6cfabb6dc991ee2d50ed7328028046dd789861..32256f6263a6c43df3e6f07cd238faf87d701d00 100644
(file)
--- 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;
}
return 0;
}
-#define CATALOG_PATH "/var/lib/systemd/catalog"
#define CATALOG_DATABASE CATALOG_PATH "/database"
int catalog_update(void) {
#define CATALOG_DATABASE CATALOG_PATH "/database"
int catalog_update(void) {
@@
-297,7
+296,7
@@
int catalog_update(void) {
goto finish;
}
goto finish;
}
- r = conf_files_list_strv(&files, ".catalog", (const char **) conf_file_dirs);
+ r = conf_files_list_strv(&files, ".catalog",
NULL,
(const char **) conf_file_dirs);
if (r < 0) {
log_error("Failed to get catalog files: %s", strerror(-r));
goto finish;
if (r < 0) {
log_error("Failed to get catalog files: %s", strerror(-r));
goto finish;
@@
-384,7
+383,7
@@
int catalog_update(void) {
goto finish;
}
goto finish;
}
- log_
info("%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);
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);
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;
if (fd < 0)
return -errno;