diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-02-06 11:30:05 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-02-06 11:30:05 +0100 |
| commit | 421180379fa6b57a68f26315c7af476487dfa2f0 (patch) | |
| tree | 0f79ed70d1aa6eaffaa33ba6a5787b9912c64b4f /src/journal/catalog.h | |
| parent | 784b22eef5005309a43400e9ab43d37281b1290c (diff) | |
| parent | c059b62fe696516855813ff03f432375333a2737 (diff) | |
Merge pull request #2138 from stefwalter/journal-combine
Combine journal catalog entries with the same id
Diffstat (limited to 'src/journal/catalog.h')
| -rw-r--r-- | src/journal/catalog.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/catalog.h b/src/journal/catalog.h index bcc73c2631..b3856d2de0 100644 --- a/src/journal/catalog.h +++ b/src/journal/catalog.h @@ -28,7 +28,7 @@ #include "hashmap.h" #include "strbuf.h" -int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path); +int catalog_import_file(Hashmap *h, const char *path); int catalog_update(const char* database, const char* root, const char* const* dirs); int catalog_get(const char* database, sd_id128_t id, char **data); int catalog_list(FILE *f, const char* database, bool oneline); |