From ad2843d65b0ab998c44a2ed7248c66bb4c32077b Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Thu, 6 Feb 2014 12:31:12 -0800
Subject: [PATCH] Be consistent about EOF handling around whitespace

---
 jsonpull.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/jsonpull.c b/jsonpull.c
index 2dea647..2d1322b 100644
--- a/jsonpull.c
+++ b/jsonpull.c
@@ -106,24 +106,19 @@ json_object *json_parse(FILE *f, json_object *current, char **error) {
 	int current_is = 0;
 	int c;
 again:
-	c = getc(f);
-	if (c == EOF) {
-		if (current != NULL) {
-			// Close out open containers
-			return current->parent;
-		} else {
-			return NULL;
-		}
-	}
-
 	/////////////////////////// Whitespace
 
-	while (c == ' ' || c == '\t' || c == '\r' || c == '\n') {
+	do {
 		c = getc(f);
 		if (c == EOF) {
-			return NULL;
+			if (current != NULL) {
+				// Close out open containers
+				return current->parent;
+			} else {
+				return NULL;
+			}
 		}
-	}
+	} while (c == ' ' || c == '\t' || c == '\r' || c == '\n');
 
 	/////////////////////////// Arrays