--- libaitio/inc/aitio.h	2012/07/29 23:50:16	1.22.2.1
+++ libaitio/inc/aitio.h	2012/07/30 10:55:51	1.22.2.4
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.22.2.1 2012/07/29 23:50:16 misho Exp $
+* $Id: aitio.h,v 1.22.2.4 2012/07/30 10:55:51 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -242,7 +242,8 @@ typedef struct {
 						__val->val_type = blob; __val->val.blob = _n; \
 						AIT_LEN(__val) = _len; } while (0)
 #define AIT_SET_BLOB2(_vl, _bv)		do { ait_val_t *__val = (_vl); assert(__val); assert((_bv)); \
-						__val->val_type = blob; AIT_LEN(__val) = (_bv)->blob_len; \
+						__val->val_type = blob; AIT_LEN(__val) = \
+							(_bv)->blob_len; \
 						__val->val.blob = (_bv)->blob_var; } while (0)
 #define AIT_NEW_BLOB(_vl, _len)		AIT_SET_BLOB((_vl), 0, _len)
 
@@ -280,10 +281,13 @@ typedef struct {
 #define AIT_COPY_VAL(_vl, _v)		do { memcpy((_vl), (_v), sizeof(ait_val_t)); \
 						switch (AIT_TYPE((_vl))) { \
 							case buffer: \
-								AIT_SET_BUF((_vl), AIT_GET_BUF((_v)), AIT_LEN((_v))); \
+								AIT_SET_BUF((_vl), \
+										AIT_GET_BUF((_v)), \
+										AIT_LEN((_v))); \
 								break; \
 							case string: \
-								AIT_SET_STR((_vl), AIT_GET_STR((_v))); \
+								AIT_SET_STR((_vl), \
+										AIT_GET_STR((_v))); \
 								break; \
 							default: \
 								break; \
@@ -291,13 +295,14 @@ typedef struct {
 					} while (0)
 #define AIT_COPY_VAL2(_vl, _v)		do { AIT_COPY_VAL((_vl), (_v)); \
 						if (AIT_TYPE((_vl)) == data) \
-							AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), AIT_LEN((_v))); \
+							AIT_SET_DATA((_vl), AIT_GET_DATA((_v)), \
+									AIT_LEN((_v))); \
 					} while (0)
 
 #define AIT_INIT_VAL(_vl)		(memset((_vl), 0, sizeof(ait_val_t)))
 #define AIT_INIT_VAL2(_vl, _t)		do { \
 						AIT_INIT_VAL((_vl)); \
-						AIT_TYPE((_vl)) = _t; \
+						(_vl)->val_type = _t; \
 					} while (0)
 					/* if attribute zeroCopy is set not execute io_free() */
 #define AIT_FREE_VAL(_vl)		do { ait_val_t *__val = (_vl); assert(__val); \
@@ -829,6 +834,17 @@ int io_arrayMake(char * __restrict psArgs, int nargs, 
 */
 int io_MakeAV(const char * __restrict csArgs, const char *csDelim, 
 		char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen);
+/*
+ * io_MakeAV2() Parse and make attribute/value pair over input string
+ *
+ * @csArgs = Input argument line, will be modified!
+ * @csDelim = Delimiter for separate
+ * @psAttr = Output Attribute
+ * @psValue = Output Value, if ==NULL this element not present value or not wanted for return
+ * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
+*/
+int io_MakeAV2(char * __restrict psArgs, const char *csDelim, 
+		char * __restrict psAttr, char * __restrict psValue);
 
 /*
  * io_sarrInit() - Create and initialize dynamic split-order array