diff options
| author | Stef Walter <stef@thewalter.net> | 2015-11-08 11:20:01 +0100 |
|---|---|---|
| committer | Stef Walter <stef@thewalter.net> | 2016-02-05 17:06:59 +0100 |
| commit | dbae138dc1a30080241cab172a4cf5cf3bb48203 (patch) | |
| tree | b70a86528fb98e147404e05d1a417bf39027f86c /src/journal/catalog.h | |
| parent | c57d67f718077aadee4e2d0940fb87f513b98671 (diff) | |
journal: Combine journal catalog entries with the same id
Instead of discarding duplicate catalog entries, we now combine
them. This allows software or admins to add or override catalog
headers, or add additional text to the catalog message.
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); |