version 1.1.2.6, 2017/11/28 11:14:00
|
version 1.1.2.8, 2017/11/28 14:57:45
|
Line 325 json_parse(json_t * __restrict json, const char *jstr,
|
Line 325 json_parse(json_t * __restrict json, const char *jstr,
|
} |
} |
break; |
break; |
case '\"': |
case '\"': |
if (json_parse_string(json, jstr, jlen, jtoks, toksnum) == -1) { | if (json_parse_string(json, jstr, jlen, jtoks, toksnum) == -1) |
elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]); | |
return (u_int) -1; |
return (u_int) -1; |
} |
|
cx++; /* start new string token */ |
cx++; /* start new string token */ |
if (jtoks && json->h_parent != -1) |
if (jtoks && json->h_parent != -1) |
jtoks[json->h_parent].tok_size++; |
jtoks[json->h_parent].tok_size++; |
Line 428 json_token2val(const char *jstr, jtok_t * __restrict t
|
Line 426 json_token2val(const char *jstr, jtok_t * __restrict t
|
if (!v) |
if (!v) |
return NULL; |
return NULL; |
|
|
AIT_SET_STRSIZ(v, tok->tok_end - tok->tok_start); | AIT_SET_STRSIZ(v, json_toklen(tok)); |
strncpy(AIT_GET_STR(v), jstr + tok->tok_start, AIT_LEN(v) - 1); | strncpy(AIT_GET_STR(v), json_tokstr(jstr, tok), AIT_LEN(v) - 1); |
|
|
return v; |
return v; |
} |
} |
Line 450 json_token2str(const char *jstr, jtok_t * __restrict t
|
Line 448 json_token2str(const char *jstr, jtok_t * __restrict t
|
if (!jstr || !tok) |
if (!jstr || !tok) |
return NULL; |
return NULL; |
|
|
len = tok->tok_end - tok->tok_start; | len = json_toklen(tok); |
str = e_malloc(len + 1); |
str = e_malloc(len + 1); |
if (!str) |
if (!str) |
return NULL; |
return NULL; |
else { |
else { |
strncpy(str, jstr + tok->tok_start, len); | strncpy(str, json_tokstr(jstr, tok), len); |
str[len] = 0; |
str[len] = 0; |
} |
} |
|
|