SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journal: drop unnecessary write_catalog() parameter

Browse Source 
write_catalog() use the hashmap only to get its size. The size is
already given in parameter 'n'.
This commit is contained in:
Michal Schmidt
2015-11-05 13:44:04 +01:00
parent bcf5c276cc
commit 8d2ecdb2cf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/catalog.c
+3 -3
View File
@@ -319,7 +319,7 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
return 0;
}
static long write_catalog(const char *database, Hashmap *h, struct strbuf *sb,
static long write_catalog(const char *database, struct strbuf *sb,
CatalogItem *items, size_t n) {
CatalogHeader header;
_cleanup_fclose_ FILE *w = NULL;
@@ -344,7 +344,7 @@ static long write_catalog(const char *database, Hashmap *h, struct strbuf *sb,
memcpy(header.signature, CATALOG_SIGNATURE, sizeof(header.signature));
header.header_size = htole64(ALIGN_TO(sizeof(CatalogHeader), 8));
header.catalog_item_size = htole64(sizeof(CatalogItem));
header.n_items = htole64(hashmap_size(h));
header.n_items = htole64(n);
r = -EIO;
@@ -445,7 +445,7 @@ int catalog_update(const char* database, const char* root, const char* const* di
assert(n == hashmap_size(h));
qsort_safe(items, n, sizeof(CatalogItem), catalog_compare_func);
r = write_catalog(database, h, sb, items, n);
r = write_catalog(database, sb, items, n);
if (r < 0)
log_error_errno(r, "Failed to write %s: %m", database);
else