diff options
| -rw-r--r-- | jsmn.c | 19 | ||||
| -rw-r--r-- | jsmn_test.c | 4 |
2 files changed, 9 insertions, 14 deletions
@@ -7,14 +7,14 @@ */ static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, jsmntok_t *tokens, size_t num_tokens) { - unsigned int i; - for (i = parser->toknext; i < num_tokens; i++) { - if (tokens[i].start == -1 && tokens[i].end == -1) { - parser->toknext = i + 1; - return &tokens[i]; - } + jsmntok_t *tok; + if (parser->toknext >= num_tokens) { + return NULL; } - return NULL; + tok = &tokens[parser->toknext++]; + tok->start = tok->end = -1; + tok->size = 0; + return tok; } /** @@ -128,11 +128,6 @@ jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, jsmntok_t *tokens, unsigned int tokindex; jsmntok_t *token; - /* initialize the rest of tokens (they could be reallocated) */ - for (tokindex = parser->toknext; tokindex < num_tokens; tokindex++) { - jsmn_fill_token(&tokens[tokindex], JSMN_PRIMITIVE, -1, -1); - } - for (; js[parser->pos] != '\0'; parser->pos++) { char c; jsmntype_t type; diff --git a/jsmn_test.c b/jsmn_test.c index 0bbd82c2f..a33d6b88c 100644 --- a/jsmn_test.c +++ b/jsmn_test.c @@ -156,13 +156,13 @@ int test_partial_string() { r = jsmn_parse(&p, js, tok, 10); check(r == JSMN_ERROR_PART && tok[0].type == JSMN_STRING); check(TOKEN_STRING(js, tok[0], "x")); - check(TOKEN_EQ(tok[1], -1, -1, 0)); + check(p.toknext == 1); js = "\"x\": \"valu"; r = jsmn_parse(&p, js, tok, 10); check(r == JSMN_ERROR_PART && tok[0].type == JSMN_STRING); check(TOKEN_STRING(js, tok[0], "x")); - check(TOKEN_EQ(tok[1], -1, -1, 0)); + check(p.toknext == 1); js = "\"x\": \"value\""; r = jsmn_parse(&p, js, tok, 10); |