picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journal: cleanup up error handling in update_catalog()

Browse source 
- Negative/positive errno mixup caused duplicates not to be detected properly.
  Now we get a warning about some duplicate entries in our own catalogs...
- Errors in update_catalog would be ignored, but they should not be.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-04-11 08:44:55 -04:00
parent 6e00a80641
commit e3b9d9c802
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/journal/catalog.c
View file

@ -103,7 +103,7 @@ static int finish_item(
const char *payload) { const char *payload) {
ssize_t offset; ssize_t offset;
CatalogItem *i; _cleanup_free_ CatalogItem *i = NULL;
int r; int r;
assert(h); assert(h);
@ -126,13 +126,14 @@ static int finish_item(
i->offset = htole64((uint64_t) offset); i->offset = htole64((uint64_t) offset);
r = hashmap_put(h, i, i); r = hashmap_put(h, i, i);
if (r == EEXIST) { if (r == -EEXIST) {
log_warning("Duplicate entry for " SD_ID128_FORMAT_STR ".%s, ignoring.", log_warning("Duplicate entry for " SD_ID128_FORMAT_STR ".%s, ignoring.",
SD_ID128_FORMAT_VAL(id), language ? language : "C"); SD_ID128_FORMAT_VAL(id), language ? language : "C");
free(i);
return 0; return 0;
} } else if (r < 0)
return r;
i = NULL;
return 0; return 0;
} }
@ -383,8 +384,8 @@ error:
int catalog_update(const char* database, const char* root, const char* const* dirs) { int catalog_update(const char* database, const char* root, const char* const* dirs) {
_cleanup_strv_free_ char **files = NULL; _cleanup_strv_free_ char **files = NULL;
char **f; char **f;
Hashmap *h;
struct strbuf *sb = NULL; struct strbuf *sb = NULL;
_cleanup_hashmap_free_free_ Hashmap *h = NULL;
_cleanup_free_ CatalogItem *items = NULL; _cleanup_free_ CatalogItem *items = NULL;
CatalogItem *i; CatalogItem *i;
Iterator j; Iterator j;
@ -406,13 +407,17 @@ int catalog_update(const char* database, const char* root, const char* const* di
} }
STRV_FOREACH(f, files) { STRV_FOREACH(f, files) {
log_debug("reading file '%s'", *f); log_debug("Reading file '%s'", *f);
catalog_import_file(h, sb, *f); r = catalog_import_file(h, sb, *f);
if (r < 0) {
log_error("Failed to import file '%s': %s.",
*f, strerror(-r));
goto finish;
}
} }
if (hashmap_size(h) <= 0) { if (hashmap_size(h) <= 0) {
log_info("No items in catalog."); log_info("No items in catalog.");
r = 0;
goto finish; goto finish;
} else } else
log_debug("Found %u items in catalog.", hashmap_size(h)); log_debug("Found %u items in catalog.", hashmap_size(h));
@ -443,11 +448,7 @@ int catalog_update(const char* database, const char* root, const char* const* di
log_debug("%s: wrote %u items, with %zu bytes of strings, %ld total size.", log_debug("%s: wrote %u items, with %zu bytes of strings, %ld total size.",
database, n, sb->len, r); database, n, sb->len, r);
r = 0;
finish: finish:
if (h)
hashmap_free_free(h);
if (sb) if (sb)
strbuf_cleanup(sb); strbuf_cleanup(sb);

3
src/journal/test-catalog.c
View file

@ -157,7 +157,8 @@ int main(int argc, char *argv[]) {
setlocale(LC_ALL, "de_DE.UTF-8"); setlocale(LC_ALL, "de_DE.UTF-8");
log_set_max_level(LOG_DEBUG); log_parse_environment();
log_open();
test_catalog_file_lang(); test_catalog_file_lang();