[libvirt PATCH 1/2] DO NOT PUSH Revert "nss: Skip empty files and avoid use of uninitialized value"

[Ján Tomko via Devel]

From: Ján Tomko <jto...@redhat.com>

This reverts commit 63a3d70697dc44ef2f8b40f7c8e9aa869227a7da.
---
 tools/nss/libvirt_nss_leases.c | 9 ++-------
 tools/nss/libvirt_nss_macs.c   | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/tools/nss/libvirt_nss_leases.c b/tools/nss/libvirt_nss_leases.c
index 6624df2928..25978e41a8 100644
--- a/tools/nss/libvirt_nss_leases.c
+++ b/tools/nss/libvirt_nss_leases.c
@@ -266,7 +266,7 @@ findLeases(const char *file,
     enum json_tokener_error jerr = json_tokener_error_parse_eof;
     int jsonflags = JSON_TOKENER_STRICT | JSON_TOKENER_VALIDATE_UTF8;
     char line[1024];
-    size_t nreadTotal = 0;
+    ssize_t nreadTotal = 0;
     int rv;
 
     if ((fd = open(file, O_RDONLY)) < 0) {
@@ -293,17 +293,12 @@ findLeases(const char *file,
         jerr = json_tokener_get_error(tok);
     } while (jerr == json_tokener_continue);
 
-    if (nreadTotal == 0) {
-        ret = 0;
-        goto cleanup;
-    }
-
     if (jerr == json_tokener_continue) {
         ERROR("Cannot parse %s: incomplete json found", file);
         goto cleanup;
     }
 
-    if (jerr != json_tokener_success) {
+    if (nreadTotal > 0 && jerr != json_tokener_success) {
         ERROR("Cannot parse %s: %s", file, json_tokener_error_desc(jerr));
         goto cleanup;
     }
diff --git a/tools/nss/libvirt_nss_macs.c b/tools/nss/libvirt_nss_macs.c
index 44544624f3..040ea045f3 100644
--- a/tools/nss/libvirt_nss_macs.c
+++ b/tools/nss/libvirt_nss_macs.c
@@ -124,7 +124,7 @@ findMACs(const char *file,
     json_tokener *tok = NULL;
     enum json_tokener_error jerr = json_tokener_error_parse_eof;
     int jsonflags = JSON_TOKENER_STRICT | JSON_TOKENER_VALIDATE_UTF8;
-    size_t nreadTotal = 0;
+    ssize_t nreadTotal = 0;
     int rv;
     size_t i;
 
@@ -152,17 +152,12 @@ findMACs(const char *file,
         jerr = json_tokener_get_error(tok);
     } while (jerr == json_tokener_continue);
 
-    if (nreadTotal == 0) {
-        ret = 0;
-        goto cleanup;
-    }
-
     if (jerr == json_tokener_continue) {
         ERROR("Cannot parse %s: incomplete json found", file);
         goto cleanup;
     }
 
-    if (jerr != json_tokener_success) {
+    if (nreadTotal > 0 && jerr != json_tokener_success) {
         ERROR("Cannot parse %s: %s", file, json_tokener_error_desc(jerr));
         goto cleanup;
     }
-- 
2.50.1