From c33b329709ebe2755181980a050d02ec7c81ed87 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 28 Nov 2014 17:09:20 +0100 Subject: 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. --- src/journal/catalog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/journal/catalog.c') 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; -- cgit v1.2.3-54-g00ecf