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

bk: 549e237c6DF7VDUVAJw4lNyLk_NI8g

diff --git a/ChangeLog b/ChangeLog
index a405f29e2caf5e38e757c045fe564c2cc60fc60d..71f2516bdb7616fad4edfbb40d6b1fd3e1e9b96f 100644 (file)
--- 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 4f70adb0db24450c16b4d9e98b952f5da52f277f..bae1063d54ec30bef253a82aed06a69e75331f0b 100644 (file)
--- 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 */