From: Lukas Nykryn <lnykryn@redhat.com>
Date: Wed, 27 Mar 2013 16:35:55 +0000 (+0100)
Subject: catalog: fix error codes handling in catalog_list_items
X-Git-Tag: v200~8
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=464264ac5a35b655065c5d95b8d8ffbbc7ff3bcf;ds=sidebyside

catalog: fix error codes handling in catalog_list_items

Previously r was set to zero and so if(r<0) was never true.
---

diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 6b195f692..7ae7b3eec 100644
--- 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 (r < 0)
+                        if (r == 0)
                                 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));
-                        if (r < 0)
+                        if (r == 0)
                                 r = k;
                         continue;
                 }