From a4e3700972fe1582189d7b5594b54b940894bdff Mon Sep 17 00:00:00 2001
From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Mon, 29 Jun 2020 02:31:18 +0000
Subject: [PATCH] Fix code formatting

---
 json_tokener.c     | 19 +++++++------------
 tests/test_parse.c |  4 ++--
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/json_tokener.c b/json_tokener.c
index 0d01d2b..63e02a1 100644
--- a/json_tokener.c
+++ b/json_tokener.c
@@ -202,7 +202,7 @@ struct json_object *json_tokener_parse_verbose(const char *str, enum json_tokene
 		 */
 	    || json_tokener_get_parse_end(tok) != strlen(str)
 #endif
-	   )
+	)
 
 	{
 		if (obj != NULL)
@@ -874,13 +874,10 @@ struct json_object *json_tokener_parse_ex(struct json_tokener *tok, const char *
 				}
 			}
 
-			while (c &&
-			    ((c >= '0' && c <= '9') ||
-				 (!is_exponent && (c=='e' || c=='E')) ||
-				 (neg_sign_ok && c=='-') ||
-				 (pos_sign_ok && c=='+') ||
-				 (!tok->is_double && c=='.')
-			 ))
+			while (c && ((c >= '0' && c <= '9') ||
+			             (!is_exponent && (c == 'e' || c == 'E')) ||
+			             (neg_sign_ok && c == '-') || (pos_sign_ok && c == '+') ||
+			             (!tok->is_double && c == '.')))
 			{
 				pos_sign_ok = neg_sign_ok = 0;
 				++case_len;
@@ -922,10 +919,8 @@ struct json_object *json_tokener_parse_ex(struct json_tokener *tok, const char *
 			    because c can be part of a new object to parse on the
 				next call to json_tokener_parse().
 			 */
-			if (tok->depth > 0 &&
-			    c != ',' && c != ']' && c != '}' && c != '/' &&
-				c != 'I' && c != 'i' &&
-			    !isspace((unsigned char)c))
+			if (tok->depth > 0 && c != ',' && c != ']' && c != '}' && c != '/' &&
+			    c != 'I' && c != 'i' && !isspace((unsigned char)c))
 			{
 				tok->err = json_tokener_error_parse_number;
 				goto out;
diff --git a/tests/test_parse.c b/tests/test_parse.c
index d84b9d6..5363f32 100644
--- a/tests/test_parse.c
+++ b/tests/test_parse.c
@@ -371,7 +371,7 @@ struct incremental_step
     {"[0e-]", -1, -1, json_tokener_success, 1},
     {"[0e-]", -1, 4, json_tokener_error_parse_number, 1, JSON_TOKENER_STRICT},
 
-	/* You might expect this to fail, but it won't because
+    /* You might expect this to fail, but it won't because
 	   it's a valid partial parse; note the char_offset: */
     {"0e+-", 5, 3, json_tokener_success, 1},
     {"0e+-", 5, 3, json_tokener_error_parse_number, 1, JSON_TOKENER_STRICT},
@@ -453,7 +453,7 @@ struct incremental_step
     {"{\"a\":1}{\"b\":2}", 15, 7, json_tokener_success, 0},
     {&"{\"a\":1}{\"b\":2}"[7], 8, 7, json_tokener_success, 1},
 
-	/*
+    /*
 	 * Though this may seem invalid at first glance, it
 	 * parses as three separate numbers, 2015, -1 and -15
 	 * Of course, simply pasting together a stream of arbitrary
-- 
2.40.0