--- libelwix/src/json.c 2018/04/19 16:13:48 1.6 +++ libelwix/src/json.c 2018/06/08 13:08:37 1.6.6.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: json.c,v 1.6 2018/04/19 16:13:48 misho Exp $ +* $Id: json.c,v 1.6.6.1 2018/06/08 13:08:37 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -1017,6 +1017,48 @@ json_add_pair(char * __restrict jstr, int jlen, int ws return -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; return -1; }