From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 27 Dec 2014 03:11:56 +0000 (-0500)
Subject: [Bug 2707] Avoid a C90 extension in libjsmn/jsmn.c
X-Git-Tag: NTP_4_2_8P1_BETA2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22056c8062708ec5b27c7f538672b03c0bd88fdc;p=thirdparty%2Fntp.git

[Bug 2707] Avoid a C90 extension in libjsmn/jsmn.c

bk: 549e237c6DF7VDUVAJw4lNyLk_NI8g
---

diff --git a/ChangeLog b/ChangeLog
index a405f29e2..71f2516bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---
 
 * [Bug 2693] ntp-keygen doesn't build without OpenSSL and sntp.
+* [Bug 2707] Avoid a C90 extension in libjsmn/jsmn.c.
 * [Bug 2709] see if we have a C99 compiler (not yet required).
 ---
 (4.2.8p1-beta1) 2014/12/23 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/libjsmn/jsmn.c b/libjsmn/jsmn.c
index 4f70adb0d..bae1063d5 100644
--- a/libjsmn/jsmn.c
+++ b/libjsmn/jsmn.c
@@ -110,6 +110,8 @@ static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js,
 		if (c == '\\') {
 			parser->pos++;
 			switch (js[parser->pos]) {
+				int i = 0;
+
 				/* Allowed escaped symbols */
 				case '\"': case '/' : case '\\' : case 'b' :
 				case 'f' : case 'r' : case 'n'  : case 't' :
@@ -117,7 +119,6 @@ static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js,
 				/* Allows escaped symbol \uXXXX */
 				case 'u':
 					parser->pos++;
-					int i = 0;
 					for(; i < 4 && js[parser->pos] != '\0'; i++) {
 						/* If it isn't a hex character we have an error */
 						if(!((js[parser->pos] >= 48 && js[parser->pos] <= 57) || /* 0-9 */