diff options
author | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 19:29:59 +0100 |
---|---|---|
committer | Michal Schmidt <mschmidt@redhat.com> | 2014-11-28 19:49:27 +0100 |
commit | 56f64d95763a799ba4475daf44d8e9f72a1bd474 (patch) | |
tree | 4c38253c718dc1972b811fa7c01ebfa3c2b7776c /src/journal/catalog.c | |
parent | 895b3a7b44fe7ca2f260986be2a877ff56a72718 (diff) |
treewide: use log_*_errno whenever %m is in the format string
If the format string contains %m, clearly errno must have a meaningful
value, so we might as well use log_*_errno to have ERRNO= logged.
Using:
find . -name '*.[ch]' | xargs sed -r -i -e \
's/log_(debug|info|notice|warning|error|emergency)\((".*%m.*")/log_\1_errno(errno, \2/'
Plus some whitespace, linewrap, and indent adjustments.
Diffstat (limited to 'src/journal/catalog.c')
-rw-r--r-- | src/journal/catalog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/journal/catalog.c b/src/journal/catalog.c index 03dddb48a5..41cdb0dade 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c @@ -210,13 +210,13 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) { f = fopen(path, "re"); if (!f) { - log_error("Failed to open file %s: %m", path); + log_error_errno(errno, "Failed to open file %s: %m", path); return -errno; } 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 +229,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; } @@ -385,7 +385,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; } |