--- libaitio/inc/aitio.h	2012/07/29 23:53:41	1.22.2.2
+++ libaitio/inc/aitio.h	2012/07/31 12:34:23	1.22.2.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.22.2.2 2012/07/29 23:53:41 misho Exp $
+* $Id: aitio.h,v 1.22.2.9 2012/07/31 12:34:23 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -213,21 +213,32 @@ typedef struct {
 								memset(__val->val.buffer, 0, _len); \
 						} } while (0)
 #define AIT_SET_STR(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
-						__val->val.string = (int8_t*) io_strdup((_v)); \
-						if (__val->val.string) { \
-							__val->val_type = string; \
+						__val->val_type = string; \
+						if ((_v)) { \
+							__val->val.string = (int8_t*) io_strdup((_v)); \
 							AIT_LEN(__val) = strlen((_v)) + 1; \
-						} } while (0)
+						} else { \
+							__val->val.string = NULL; \
+							AIT_LEN(__val) = 0; \
+						} \
+					} while (0)
 #define AIT_SET_STRCAT(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
 						assert(AIT_TYPE(__val) == string); \
+						if (!__val->val.string) \
+							AIT_LEN(__val) = 1; \
 						void *__p = io_realloc(__val->val.string, \
 								AIT_LEN(__val) + strlen((_v))); \
 						if (__p) { \
-							__val->val.string = __p; \
 							AIT_LEN(__val) += strlen((_v)); \
+							if (!__val->val.string) \
+								memset(__p, 0, AIT_LEN(__val)); \
+							__val->val.string = __p; \
 							strlcat((char*) __val->val.string, (_v), \
 									AIT_LEN(__val)); \
-						} } while (0)
+						} else \
+							if (!__val->val.string) \
+								AIT_LEN(__val) = 0; \
+					} while (0)
 #define AIT_SET_STRCPY(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
 						assert(AIT_TYPE(__val) == string); \
 						void *__p = io_realloc(__val->val.string, \
@@ -331,19 +342,20 @@ typedef struct {
 						switch (AIT_TYPE(__val)) { \
 							case buffer: \
 							case string: \
-								memset(__val->val.buffer, 0, \
+								if (__val->val.buffer) \
+									memset(__val->val.buffer, 0, \
 										AIT_LEN(__val)); \
 								break; \
-							case data: \
-								memset(__val->val_data, 0, \
-										AIT_LEN(__val)); \
-								break; \
 							default: \
 								__val->val.net = 0LL; \
 								break; \
 						} \
 						AIT_KEY(__val) = 0; \
 					} while (0)
+#define AIT_ZERO_VAL2(_vl)		do { assert((_vl)); \
+						if (AIT_TYPE((_vl)) == data) \
+							memset((_vl)->val_data, 0, AIT_LEN((_vl))); \
+					} while (0)
 
 struct io_ether_addr {
 	u_int8_t ether_addr_octet[6];
@@ -834,6 +846,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