diff --git a/jsmn.c b/jsmn.c index 7d701a7..0e3ad74 100644 --- a/jsmn.c +++ b/jsmn.c @@ -34,7 +34,7 @@ static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type, /** * Fills next available token with JSON primitive. */ -static jsmnerr_t jsmn_parse_primitive(jsmn_parser *parser, const char *js, +static int jsmn_parse_primitive(jsmn_parser *parser, const char *js, size_t len, jsmntok_t *tokens, size_t num_tokens) { jsmntok_t *token; int start; @@ -83,7 +83,7 @@ found: /** * Filsl next token with JSON string. */ -static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, +static int jsmn_parse_string(jsmn_parser *parser, const char *js, size_t len, jsmntok_t *tokens, size_t num_tokens) { jsmntok_t *token; @@ -150,9 +150,9 @@ static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, /** * Parse JSON string and fill tokens. */ -jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len, +int jsmn_parse(jsmn_parser *parser, const char *js, size_t len, jsmntok_t *tokens, unsigned int num_tokens) { - jsmnerr_t r; + int r; int i; jsmntok_t *token; int count = parser->toknext; diff --git a/jsmn.h b/jsmn.h index 59cbaa2..01ca99c 100644 --- a/jsmn.h +++ b/jsmn.h @@ -22,14 +22,14 @@ typedef enum { JSMN_PRIMITIVE = 4 } jsmntype_t; -typedef enum { +enum jsmnerr { /* Not enough tokens were provided */ JSMN_ERROR_NOMEM = -1, /* Invalid character inside JSON string */ JSMN_ERROR_INVAL = -2, /* The string is not a full JSON packet, more bytes expected */ JSMN_ERROR_PART = -3 -} jsmnerr_t; +}; /** * JSON token description. @@ -66,7 +66,7 @@ void jsmn_init(jsmn_parser *parser); * Run JSON parser. It parses a JSON data string into and array of tokens, each describing * a single JSON object. */ -jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len, +int jsmn_parse(jsmn_parser *parser, const char *js, size_t len, jsmntok_t *tokens, unsigned int num_tokens); #ifdef __cplusplus