diff options
| author | Daniel Mack <github@zonque.org> | 2015-10-01 09:46:09 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-10-01 09:46:09 +0200 |
| commit | 47c67a5042968163dae8d4e4d160232800843e55 (patch) | |
| tree | 8b30347368544961ff6e08d4330fa014b5e43cfc /src/journal/catalog.c | |
| parent | 8abf5291564e771bfc62c74a55ab3f3b56f45257 (diff) | |
| parent | 5c22925a5713ad6f62d89ef478b82e571e9ba688 (diff) | |
Merge pull request #1426 from poettering/log-syntax
logging fixes and more
Diffstat (limited to 'src/journal/catalog.c')
| -rw-r--r-- | src/journal/catalog.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/journal/catalog.c b/src/journal/catalog.c index a3e51e2f52..78ca4b02e8 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c @@ -419,8 +419,7 @@ int catalog_update(const char* database, const char* root, const char* const* di log_debug("Reading file '%s'", *f); r = catalog_import_file(h, sb, *f); if (r < 0) { - log_error("Failed to import file '%s': %s.", - *f, strerror(-r)); + log_error_errno(r, "Failed to import file '%s': %m", *f); goto finish; } } @@ -676,8 +675,7 @@ 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_errno(k, "Failed to parse id128 '%s': %m", - *item); + log_error_errno(k, "Failed to parse id128 '%s': %m", *item); if (r == 0) r = k; continue; @@ -685,9 +683,8 @@ int catalog_list_items(FILE *f, const char *database, bool oneline, char **items k = catalog_get(database, id, &msg); if (k < 0) { - log_full(k == -ENOENT ? LOG_NOTICE : LOG_ERR, - "Failed to retrieve catalog entry for '%s': %s", - *item, strerror(-k)); + log_full_errno(k == -ENOENT ? LOG_NOTICE : LOG_ERR, k, + "Failed to retrieve catalog entry for '%s': %m", *item); if (r == 0) r = k; continue; |