catalog: fix error codes handling in catalog_list_items

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

diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 6b195f6920a16de5418cfdbfe883c6d7ea455fc2..7ae7b3eecf204f5a368420a4ea5f89a5c37e72dd 100644 (file)
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -617,7 +617,7 @@ int catalog_list_items(FILE *f, bool oneline, char **items) {
                 if (k < 0) {
                         log_error("Failed to parse id128 '%s': %s",
                                   *item, strerror(-k));
                 if (k < 0) {
                         log_error("Failed to parse id128 '%s': %s",
                                   *item, strerror(-k));

-                        if (r < 0)
+                        if (r == 0)

                                 r = k;
                         continue;
                 }
                                 r = k;
                         continue;
                 }


@@ -627,7 +627,7 @@ int catalog_list_items(FILE *f, bool oneline, char **items) {
                         log_full(k == -ENOENT ? LOG_NOTICE : LOG_ERR,
                                  "Failed to retrieve catalog entry for '%s': %s",
                                   *item, strerror(-k));
                         log_full(k == -ENOENT ? LOG_NOTICE : LOG_ERR,
                                  "Failed to retrieve catalog entry for '%s': %s",
                                   *item, strerror(-k));

-                        if (r < 0)
+                        if (r == 0)

                                 r = k;
                         continue;
                 }
                                 r = k;
                         continue;
                 }