--- libelwix/inc/elwix/ajson.h	2017/12/03 20:01:42	1.2.2.1
+++ libelwix/inc/elwix/ajson.h	2018/04/16 14:02:35	1.4.6.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: ajson.h,v 1.2.2.1 2017/12/03 20:01:42 misho Exp $
+* $Id: ajson.h,v 1.4.6.1 2018/04/16 14:02:35 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2017
+Copyright 2004 - 2018
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -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,14 @@ 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_token2array() - Convert token to string array
  *
  * @jstr = JSON string
@@ -159,12 +168,13 @@ array_t *json_token2array(const char *jstr, jtok_t * _
  *
  * @jstr = JSON string
  * @key = Search key
+ * @type = Search key for particular token type, if is J_UNDEF this mean any type
  * @toks = Parsed tokens
  * @toksnum = Number of parsed tokens
  * return: =NULL error or !=NULL data token found 
  */
 jtok_t *json_findbykey(const char *jstr, const char *key, 
-		jtok_t * __restrict toks, int toksnum);
+		jtype_t type, jtok_t * __restrict toks, int toksnum);
 
 
 /*