version 1.1.2.7, 2017/11/28 13:42:22
|
version 1.1.2.10, 2017/11/29 08:32:46
|
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 569 json_token2array(const char *jstr, jtok_t * __restrict
|
Line 567 json_token2array(const char *jstr, jtok_t * __restrict
|
} |
} |
|
|
return arr; |
return arr; |
|
} |
|
|
|
|
|
|
|
/* |
|
* json_add_begin_object() - Adds begin of object { |
|
* |
|
* @jstr = JSON string |
|
* @jlen = JSON string length |
|
* @wspace = whitespace include |
|
* return: -1 error or !=-1 actual JSON string length |
|
*/ |
|
int |
|
json_add_begin_object(char * __restrict jstr, int jlen, int wspace) |
|
{ |
|
int len; |
|
size_t eos; |
|
|
|
if (!jstr) |
|
return -1; |
|
else |
|
eos = strlen(jstr); |
|
|
|
|
|
if (wspace) |
|
len = strlcat(jstr, "{ ", jlen); |
|
else |
|
len = strlcat(jstr, "{", jlen); |
|
|
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
|
|
return len; |
|
} |
|
|
|
/* |
|
* json_add_end_object() - Adds end of object } |
|
* |
|
* @jstr = JSON string |
|
* @jlen = JSON string length |
|
* @wspace = whitespace include |
|
* return: -1 error or !=-1 actual JSON string length |
|
*/ |
|
int |
|
json_add_end_object(char * __restrict jstr, int jlen, int wspace) |
|
{ |
|
int len; |
|
size_t eos; |
|
|
|
if (!jstr) |
|
return -1; |
|
else |
|
eos = strlen(jstr); |
|
|
|
if (wspace) |
|
len = strlcat(jstr, " }", jlen); |
|
else |
|
len = strlcat(jstr, "}", jlen); |
|
|
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
|
|
return len; |
|
} |
|
|
|
/* |
|
* json_add_begin_array() - Adds begin of array [ |
|
* |
|
* @jstr = JSON string |
|
* @jlen = JSON string length |
|
* @wspace = whitespace include |
|
* return: -1 error or !=-1 actual JSON string length |
|
*/ |
|
int |
|
json_add_begin_array(char * __restrict jstr, int jlen, int wspace) |
|
{ |
|
int len; |
|
size_t eos; |
|
|
|
if (!jstr) |
|
return -1; |
|
else |
|
eos = strlen(jstr); |
|
|
|
if (wspace) |
|
len = strlcat(jstr, "[ ", jlen); |
|
else |
|
len = strlcat(jstr, "[", jlen); |
|
|
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
|
|
return len; |
|
} |
|
|
|
/* |
|
* json_add_end_array() - Adds end of array ] |
|
* |
|
* @jstr = JSON string |
|
* @jlen = JSON string length |
|
* @wspace = whitespace include |
|
* return: -1 error or !=-1 actual JSON string length |
|
*/ |
|
int |
|
json_add_end_array(char * __restrict jstr, int jlen, int wspace) |
|
{ |
|
int len; |
|
size_t eos; |
|
|
|
if (!jstr) |
|
return -1; |
|
else |
|
eos = strlen(jstr); |
|
|
|
if (wspace) |
|
len = strlcat(jstr, " ]", jlen); |
|
else |
|
len = strlcat(jstr, "]", jlen); |
|
|
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
|
|
return len; |
|
} |
|
|
|
/* |
|
* json_add_char() - Adds character |
|
* |
|
* @jstr = JSON string |
|
* @jlen = JSON string length |
|
* @ch = Character |
|
* return: -1 error or !=-1 actual JSON string length |
|
*/ |
|
int |
|
json_add_char(char * __restrict jstr, int jlen, u_char ch) |
|
{ |
|
int len; |
|
|
|
if (!jstr) |
|
return -1; |
|
|
|
len = strlen(jstr) + 1; |
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
return -1; |
|
} else { |
|
jstr[len++] = (char) ch; |
|
jstr[len] = 0; |
|
} |
|
|
|
return len; |
|
} |
|
|
|
/* |
|
* json_add_colon() - Adds key/value pair delimiter colon : |
|
* |
|
* @jstr = JSON string |
|
* @jlen = JSON string length |
|
* @wspace = whitespace include |
|
* return: -1 error or !=-1 actual JSON string length |
|
*/ |
|
int |
|
json_add_colon(char * __restrict jstr, int jlen, int wspace) |
|
{ |
|
int len; |
|
size_t eos; |
|
|
|
if (!jstr) |
|
return -1; |
|
else |
|
eos = strlen(jstr); |
|
|
|
if (wspace) |
|
len = strlcat(jstr, ": ", jlen); |
|
else |
|
len = strlcat(jstr, ":", jlen); |
|
|
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
|
|
return len; |
|
} |
|
|
|
/* |
|
* json_add_comma() - Adds value delimiter comma , |
|
* |
|
* @jstr = JSON string |
|
* @jlen = JSON string length |
|
* @wspace = whitespace include |
|
* return: -1 error or !=-1 actual JSON string length |
|
*/ |
|
int |
|
json_add_comma(char * __restrict jstr, int jlen, int wspace) |
|
{ |
|
int len; |
|
size_t eos; |
|
|
|
if (!jstr) |
|
return -1; |
|
else |
|
eos = strlen(jstr); |
|
|
|
if (wspace) |
|
len = strlcat(jstr, ", ", jlen); |
|
else |
|
len = strlcat(jstr, ",", jlen); |
|
|
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
|
|
return len; |
|
} |
|
|
|
/* |
|
* json_add_string() - Adds string |
|
* |
|
* @jstr = JSON string |
|
* @jlen = JSON string length |
|
* @unquot = Unquoted string |
|
* @str = String, it can't be NULL |
|
* return: -1 error or !=-1 actual JSON string length |
|
*/ |
|
int |
|
json_add_string(char * __restrict jstr, int jlen, int unquot, const char *str) |
|
{ |
|
int len; |
|
size_t eos; |
|
|
|
if (!jstr || !str) |
|
return -1; |
|
else |
|
eos = strlen(jstr); |
|
|
|
if (!unquot) { |
|
len = strlcat(jstr, "\"", jlen); |
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
} |
|
len = strlcat(jstr, str, jlen); |
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
if (!unquot) { |
|
len = strlcat(jstr, "\"", jlen); |
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
} |
|
|
|
return len; |
|
} |
|
|
|
/* |
|
* json_add_value() - Adds value |
|
* |
|
* @jstr = JSON string |
|
* @jlen = JSON string length |
|
* @unquot = Unquoted number |
|
* @num = Number |
|
* return: -1 error or !=-1 actual JSON string length |
|
*/ |
|
int |
|
json_add_value(char * __restrict jstr, int jlen, int unquot, long num) |
|
{ |
|
int len; |
|
char wrk[STRSIZ] = { [0 ... STRSIZ - 1] = 0 }; |
|
size_t eos; |
|
|
|
if (!jstr) |
|
return -1; |
|
else |
|
eos = strlen(jstr); |
|
|
|
if (!unquot) { |
|
len = strlcat(jstr, "\"", jlen); |
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
} |
|
snprintf(wrk, sizeof wrk, "%ld", num); |
|
len = strlcat(jstr, wrk, jlen); |
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
if (!unquot) { |
|
len = strlcat(jstr, "\"", jlen); |
|
if (len >= jlen) { |
|
elwix_SetErr(J_ERR_NOMEM, "%s", jerrstr[J_ERR_NOMEM]); |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
} |
|
|
|
return len; |
|
} |
|
|
|
/* |
|
* json_add_pair() - Adds key/value pair |
|
* |
|
* @jstr = JSON string |
|
* @jlen = JSON string length |
|
* @wspace = whitespace include |
|
* @key = Key string |
|
* @val = Value string |
|
* return: -1 error or !=-1 actual JSON string length |
|
*/ |
|
int |
|
json_add_pair(char * __restrict jstr, int jlen, int wspace, const char *key, const char *val) |
|
{ |
|
int len = -1; |
|
size_t eos; |
|
|
|
if (!jstr || !key || !val) |
|
return -1; |
|
else |
|
eos = strlen(jstr); |
|
|
|
if (json_add_string(jstr, jlen, 0, key) == -1) { |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
if (json_add_colon(jstr, jlen, wspace) == -1) { |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
if ((len = json_add_string(jstr, jlen, 0, key)) == -1) { |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
|
|
return len; |
|
} |
|
|
|
/* |
|
* json_add_array() - Adds array |
|
* |
|
* @jstr = JSON string |
|
* @jlen = JSON string length |
|
* @wspace = whitespace include |
|
* @arr = Array with variables |
|
* return: -1 error or !=-1 actual JSON string length |
|
*/ |
|
int |
|
json_add_array(char * __restrict jstr, int jlen, int wspace, array_t * __restrict arr) |
|
{ |
|
int len = -1; |
|
register int i; |
|
ait_val_t *v; |
|
size_t eos; |
|
|
|
if (!jstr || !arr) |
|
return -1; |
|
else |
|
eos = strlen(jstr); |
|
|
|
if (json_add_begin_array(jstr, jlen, wspace) == -1) { |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
for (i = 0; i < array_Size(arr); i++) { |
|
v = array(arr, i, ait_val_t*); |
|
if (v) { |
|
if (AIT_TYPE(v) == string) { |
|
if (json_add_string(jstr, jlen, 0, AIT_GET_STR(v)) == -1) { |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
} else { |
|
if (json_add_value(jstr, jlen, 0, AIT_GET_LIKE(v, long)) == -1) { |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
} |
|
if (i < array_Size(arr) - 1 && json_add_comma(jstr, jlen, wspace) == -1) { |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
} |
|
} |
|
if ((len = json_add_end_array(jstr, jlen, wspace)) == -1) { |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
|
|
return len; |
} |
} |