summaryrefslogtreecommitdiff
path: root/src/journal/catalog.c
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-11-28 17:09:20 +0100
committerMichal Schmidt <mschmidt@redhat.com>2014-11-28 17:17:51 +0100
commitc33b329709ebe2755181980a050d02ec7c81ed87 (patch)
tree39080c428c72c90daddbe1c08d45c181adf1476c /src/journal/catalog.c
parent5567fafbc9d83a1391f23ecdbe698a3c03929370 (diff)
treewide: more log_*_errno() conversions, multiline calls
Basically: find . -name '*.[ch]' | while read f; do perl -i.mmm -e \ 'local $/; local $_=<>; s/log_(debug|info|notice|warning|error|emergency)\("([^"]*)%s"([^;]*),\s*strerror\(-?([->a-zA-Z_]+)\)\);/log_\1_errno(\4, "\2%m"\3);/gms;print;' \ $f; done Plus manual indentation fixups.
Diffstat (limited to 'src/journal/catalog.c')
-rw-r--r--src/journal/catalog.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index f16e28a7a8..67bf4ba017 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -348,8 +348,8 @@ static long write_catalog(const char *database, Hashmap *h, struct strbuf *sb,
r = fopen_temporary(database, &w, &p);
if (r < 0) {
- log_error("Failed to open database for writing: %s: %s",
- database, strerror(-r));
+ log_error_errno(r, "Failed to open database for writing: %s: %m",
+ database);
return r;
}
@@ -687,8 +687,8 @@ int catalog_list_items(FILE *f, const char *database, bool oneline, char **items
k = sd_id128_from_string(*item, &id);
if (k < 0) {
- log_error("Failed to parse id128 '%s': %s",
- *item, strerror(-k));
+ log_error_errno(k, "Failed to parse id128 '%s': %m",
+ *item);
if (r == 0)
r = k;
continue;