--- libelwix/inc/elwix/ajson.h 2017/11/24 10:29:15 1.1.2.2 +++ libelwix/inc/elwix/ajson.h 2017/11/24 15:53:04 1.1.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: ajson.h,v 1.1.2.2 2017/11/24 10:29:15 misho Exp $ +* $Id: ajson.h,v 1.1.2.3 2017/11/24 15:53:04 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -63,22 +63,16 @@ typedef enum { J_ERR_OK = 0, J_ERR_NOMEM = 1, J_ERR_INVAL = 2, - J_ERR_PART = 3 + J_ERR_PART = 3, + J_ERR_PARAM = 4 } jerr_t; -/* JSON error strings */ -typedef const char jerrstr[] = { - "No error", - "Not enough tokens were provided", - "Invalid character", - "JSON string isn't full", - NULL -}; - -typedef struct _tagParser { - unsigned long pos; - unsigned long next; - long parent; +typedef struct _tagHandler { + unsigned long h_pos; + unsigned long h_next; + long h_parent; + void *h_alloc; + int h_strict; } json_t; typedef struct _tagToken { @@ -94,9 +88,10 @@ typedef struct _tagToken { * json_init() - Initialize JSON handler * * @json = JSON handler, if there is NULL then dynamically will be allocated - * return: =NULL error or !=NULL ready for use JSON handler. + * @jstrict = JSON strict mode, when we select strict mode every unquoted value is error + * return: =NULL error or !=NULL ready for use JSON handler and should be free with json_free() */ -json_t *json_init(json_t * __restrict json); +json_t *json_init(json_t * __restrict json, int jstrict); /* * json_free() - Free JSON handler @@ -104,7 +99,7 @@ json_t *json_init(json_t * __restrict json); * @json = JSON handler * return: none */ -void json_free(json_t **json); +void json_free(json_t * __restrict json); /* * json_parse() - Parse JSON string