treewide: simplify log_*_errno(r,...) immediately followed by "return r"

[elogind.git] / src / journal / catalog.c

diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 41d450b1544d6fbf2e8e140e016b2b42c2625cc2..03dddb48a55d86469880eaef9d150440289fca17 100644 (file)
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -341,17 +341,13 @@ static long write_catalog(const char *database, Hashmap *h, struct strbuf *sb,
                 return log_oom();
 
         r = mkdir_p(d, 0775);
-        if (r < 0) {
-                log_error("Recursive mkdir %s: %s", d, strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Recursive mkdir %s: %m", d);
 
         r = fopen_temporary(database, &w, &p);
-        if (r < 0) {
-                log_error("Failed to open database for writing: %s: %s",
-                          database, strerror(-r));
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to open database for writing: %s: %m",
+                                       database);
 
         zero(header);
         memcpy(header.signature, CATALOG_SIGNATURE, sizeof(header.signature));
@@ -422,7 +418,7 @@ int catalog_update(const char* database, const char* root, const char* const* di
 
         r = conf_files_list_strv(&files, ".catalog", root, dirs);
         if (r < 0) {
-                log_error("Failed to get catalog files: %s", strerror(-r));
+                log_error_errno(r, "Failed to get catalog files: %m");
                 goto finish;
         }
 
@@ -463,7 +459,7 @@ int catalog_update(const char* database, const char* root, const char* const* di
 
         r = write_catalog(database, h, sb, items, n);
         if (r < 0)
-                log_error("Failed to write %s: %s", database, strerror(-r));
+                log_error_errno(r, "Failed to write %s: %m", database);
         else
                 log_debug("%s: wrote %u items, with %zu bytes of strings, %ld total size.",
                           database, n, sb->len, r);
@@ -687,8 +683,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;