From: Michal Schmidt <mschmidt@redhat.com>
Date: Thu, 5 Nov 2015 12:44:04 +0000 (+0100)
Subject: journal: drop unnecessary write_catalog() parameter
X-Git-Tag: v228~79^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d2ecdb2cf1bc5b1125e69deaa852c6791ab5a41;p=thirdparty%2Fsystemd.git

journal: drop unnecessary write_catalog() parameter

write_catalog() use the hashmap only to get its size. The size is
already given in parameter 'n'.
---

diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 95a68574721..7f43a49bcf2 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -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