--- libelwix/inc/elwix/ajson.h	2018/03/07 12:29:28	1.4
+++ libelwix/inc/elwix/ajson.h	2018/06/26 14:39:13	1.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: ajson.h,v 1.4 2018/03/07 12:29:28 misho Exp $
+* $Id: ajson.h,v 1.7 2018/06/26 14:39:13 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -133,9 +133,10 @@ ait_val_t *json_token2val(const char *jstr, jtok_t * _
  *
  * @jstr = JSON string
  * @tok = Token for convert
- * @return =NULL error or !=NULL allocated str, after use should be e_free()
+ * @return =NULL error or !=NULL allocated str, after use should be json_freestr()|e_free()
  */
 char *json_token2str(const char *jstr, jtok_t * __restrict tok);
+#define json_freestr(x)		e_free((x))
 /*
  * json_token2num() - Return token to numeric
  *
@@ -145,6 +146,22 @@ char *json_token2str(const char *jstr, jtok_t * __rest
  */
 long json_token2num(const char *jstr, jtok_t * __restrict tok);
 /*
+ * json_token2dbl() - Return token to double
+ *
+ * @jstr = JSON string
+ * @tok = Token for convert
+ * @return number
+ */
+double json_token2dbl(const char *jstr, jtok_t * __restrict tok);
+/*
+ * json_token2bool() - Return token to bool int
+ *
+ * @jstr = JSON string
+ * @tok = Token for convert
+ * @return 0 for FALSE and !=0 for TRUE
+ */
+int json_token2bool(const char *jstr, jtok_t * __restrict tok);
+/*
  * json_token2array() - Convert token to string array
  *
  * @jstr = JSON string
@@ -155,7 +172,7 @@ long json_token2num(const char *jstr, jtok_t * __restr
 array_t *json_token2array(const char *jstr, jtok_t * __restrict tok);
 
 /*
- * json_findbykey() - Find data by key
+ * json_findbykey() - Find token data by key
  *
  * @jstr = JSON string
  * @key = Search key
@@ -166,6 +183,15 @@ array_t *json_token2array(const char *jstr, jtok_t * _
  */
 jtok_t *json_findbykey(const char *jstr, const char *key, 
 		jtype_t type, jtok_t * __restrict toks, int toksnum);
+/*
+ * json_findbypos() - Find token by position on JSON string
+ *
+ * @pos = Offset from begin of JSON string
+ * @toks = Parsed tokens
+ * @toksnum = Number of parsed tokens
+ * return: =NULL error or !=NULL token found 
+ */
+jtok_t *json_findbypos(unsigned long pos, jtok_t * __restrict toks, int toksnum);
 
 
 /*
@@ -179,6 +205,17 @@ jtok_t *json_findbykey(const char *jstr, const char *k
  * return: 0 done and 1 added one more item
  */
 int json_dump_yaml(FILE *f, const char *jstr, jtok_t *toks, int toksnum, int indent);
+/*
+ * json_dump() - Dump parsed JSON string to structure format
+ *
+ * @f = Output handler
+ * @jstr = JSON string
+ * @toks = JSON tokens
+ * @toksnum = Number of tokens
+ * @indent = Start indent spaces
+ * return: 0 done and 1 added one more item
+ */
+int json_dump(FILE *f, const char *jstr, jtok_t *toks, int toksnum, int indent);
 
 
 /*
@@ -276,6 +313,18 @@ int json_add_value(char * __restrict jstr, int jlen, i
  */
 int json_add_pair(char * __restrict jstr, int jlen, int wspace, 
 		const char *key, const char *val);
+/*
+ * 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, ...);
 /*
  * json_add_array() - Adds array
  *