version 1.5.2.1, 2018/04/19 16:12:45
|
version 1.7.12.1, 2019/01/31 22:19:46
|
Line 12 terms:
|
Line 12 terms:
|
All of the documentation and software included in the ELWIX and AITNET |
All of the documentation and software included in the ELWIX and AITNET |
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
|
|
Copyright 2004 - 2018 | Copyright 2004 - 2019 |
by Michael Pounov <misho@elwix.org>. All rights reserved. |
by Michael Pounov <misho@elwix.org>. All rights reserved. |
|
|
Redistribution and use in source and binary forms, with or without |
Redistribution and use in source and binary forms, with or without |
Line 224 json_parse_value(json_t * __restrict json, const char
|
Line 224 json_parse_value(json_t * __restrict json, const char
|
case '}': |
case '}': |
goto found; |
goto found; |
} |
} |
if (jstr[json->h_pos] < 32 || jstr[json->h_pos] > 127) { | if (jstr[json->h_pos] < 32 || (u_char) jstr[json->h_pos] > 127) { |
json->h_pos = pos; |
json->h_pos = pos; |
elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]); |
elwix_SetErr(J_ERR_INVAL, "%s", jerrstr[J_ERR_INVAL]); |
return -1; |
return -1; |
Line 1017 json_add_pair(char * __restrict jstr, int jlen, int ws
|
Line 1017 json_add_pair(char * __restrict jstr, int jlen, int ws
|
return -1; |
return -1; |
} |
} |
if ((len = json_add_string(jstr, jlen, 0, val)) == -1) { |
if ((len = json_add_string(jstr, jlen, 0, val)) == -1) { |
|
jstr[eos] = 0; |
|
return -1; |
|
} |
|
|
|
return len; |
|
} |
|
|
|
/* |
|
* json_add_pair2() - Adds key/value pair with formated args |
|
* |
|
* @jstr = JSON string |
|
* @jlen = JSON string length |
|
* @wspace = whitespace include |
|
* @key = Key string |
|
* @fmt = Format string for values |
|
* return: -1 error or !=-1 actual JSON string length |
|
*/ |
|
int |
|
json_add_pair2(char * __restrict jstr, int jlen, int wspace, const char *key, const char *fmt, ...) |
|
{ |
|
int len = -1; |
|
size_t eos; |
|
va_list lst; |
|
char szStr[BUFSIZ] = { [0 ... BUFSIZ - 1] = 0 }; |
|
|
|
if (!jstr || !key || !fmt) |
|
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; |
|
} |
|
va_start(lst, fmt); |
|
vsnprintf(szStr, sizeof szStr, fmt, lst); |
|
va_end(lst); |
|
if ((len = json_add_string(jstr, jlen, 0, szStr)) == -1) { |
jstr[eos] = 0; |
jstr[eos] = 0; |
return -1; |
return -1; |
} |
} |