X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fcatalog.c;h=81a2e946e4867b30e31f7e6d80987b75ba2eea67;hp=41d450b1544d6fbf2e8e140e016b2b42c2625cc2;hb=4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f;hpb=d5099efc47d4e6ac60816b5381a5f607ab03f06e

diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 41d450b15..81a2e946e 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -209,14 +209,12 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
         assert(path);
 
         f = fopen(path, "re");
-        if (!f) {
-                log_error("Failed to open file %s: %m", path);
-                return -errno;
-        }
+        if (!f)
+                return log_error_errno(errno, "Failed to open file %s: %m", path);
 
         r = catalog_file_lang(path, &deflang);
         if (r < 0)
-                log_error("Failed to determine language for file %s: %m", path);
+                log_error_errno(errno, "Failed to determine language for file %s: %m", path);
         if (r == 1)
                 log_debug("File %s has language %s.", path, deflang);
 
@@ -229,7 +227,7 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
                         if (feof(f))
                                 break;
 
-                        log_error("Failed to read file %s: %m", path);
+                        log_error_errno(errno, "Failed to read file %s: %m", path);
                         return -errno;
                 }
 
@@ -341,17 +339,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));
@@ -389,7 +383,7 @@ static long write_catalog(const char *database, Hashmap *h, struct strbuf *sb,
         fchmod(fileno(w), 0644);
 
         if (rename(p, database) < 0) {
-                log_error("rename (%s -> %s) failed: %m", p, database);
+                log_error_errno(errno, "rename (%s -> %s) failed: %m", p, database);
                 r = -errno;
                 goto error;
         }
@@ -422,7 +416,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 +457,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 +681,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;