--- libaitio/inc/aitio.h	2012/07/30 14:58:31	1.22.2.8
+++ libaitio/inc/aitio.h	2012/07/31 16:42:38	1.22.2.16
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.22.2.8 2012/07/30 14:58:31 misho Exp $
+* $Id: aitio.h,v 1.22.2.16 2012/07/31 16:42:38 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -180,14 +180,14 @@ typedef struct {
 #define AIT_GET_F32(_vl)		(assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32)
 #define AIT_GET_F64(_vl)		(assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64)
 
-#define AIT_SET_DATA(_vl, _p, _len)	do { ait_val_t *__val = (_vl); \
-						__val = io_realloc(__val, sizeof(ait_val_t) + _len); \
+#define AIT_SET_DATA(_vl, _p, _len)	do { ait_val_t *__val = io_realloc((_vl), (sizeof(ait_val_t) + _len)); \
 						if (__val) { \
+							void *__p = (_p); \
+							if (__p) \
+								memcpy(__val->val_data, __p, _len); \
 							__val->val_type = data; AIT_LEN(__val) = _len; \
-							if ((_p)) \
-								memcpy(__val->val_data, (_p), _len); \
+							(_vl) = __val; \
 						} \
-						(_vl) = __val; \
 					} while (0);
 #define AIT_SET_PTR(_vl, _p, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
 						__val->val_type = ptr; __val->val.ptr = _p; \
@@ -203,48 +203,73 @@ typedef struct {
 							__val->val_type = buffer; AIT_LEN(__val) = _len; \
 							memset(__val->val.buffer, _c, _len); \
 						} } while (0)
-#define AIT_SET_BUF(_vl, _v, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
+#define AIT_SET_BUF(_vl, _v, _len)	do { ait_val_t *__val = (_vl); void *__p = (_v); assert(__val); \
 						__val->val.buffer = io_malloc(_len); \
 						if (__val->val.buffer) { \
 							__val->val_type = buffer; AIT_LEN(__val) = _len; \
-							if ((_v)) \
-								memcpy(__val->val.buffer, (_v), _len); \
+							if (__p) \
+								memcpy(__val->val.buffer, __p, _len); \
 							else \
 								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)); \
+#define AIT_SET_STR(_vl, _v)		do { ait_val_t *__val = (_vl); const char *__s = (_v); assert(__val); \
+						__val->val_type = string; \
+						if (__s && *__s) { \
+							__val->val.string = (int8_t*) io_strdup(__s); \
+							AIT_LEN(__val) = strlen((const char*) \
+									__val->val.string) + 1; \
+						} else { \
+							__val->val.string = NULL; \
+							AIT_LEN(__val) = 0; \
+						} \
+					} while (0)
+#define AIT_SET_STRSIZ(_vl, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
+						__val->val.string = (int8_t*) io_malloc(_len); \
 						if (__val->val.string) { \
-							__val->val_type = string; \
-							AIT_LEN(__val) = strlen((_v)) + 1; \
-						} } while (0)
-#define AIT_SET_STRCAT(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
-						assert(AIT_TYPE(__val) == string); \
+							__val->val_type = string; AIT_LEN(__val) = _len; \
+							memset(__val->val.string, 0, _len); \
+						} \
+					} while (0)
+#define AIT_SET_STRCAT(_vl, _v)		do { ait_val_t *__val = (_vl); const char *__s = (_v); int __l; \
+						assert(__val); assert(AIT_TYPE(__val) == string); \
+						if (!__s || !*__s) \
+							break; \
+						else \
+							__l = strlen(__s); \
 						if (!__val->val.string) \
-							AIT_LEN(__val) = 1; \
-						void *__p = io_realloc(__val->val.string, \
-								AIT_LEN(__val) + strlen((_v))); \
+							__l++; \
+						void *__p = io_realloc(__val->val.string, AIT_LEN(__val) + __l); \
 						if (__p) { \
-							AIT_LEN(__val) += strlen((_v)); \
-							if (!__val->val.string) \
-								memset(__p, 0, AIT_LEN(__val)); \
+							AIT_LEN(__val) += __l; \
 							__val->val.string = __p; \
-							strlcat((char*) __val->val.string, (_v), \
+							strlcat((char*) __val->val.string, __s, \
 									AIT_LEN(__val)); \
-						} 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, \
-								strlen((_v)) + 1); \
+#define AIT_SET_STRCPY(_vl, _v)		do { ait_val_t *__val = (_vl); const char *__s = (_v); int __l; \
+						assert(__val); assert(AIT_TYPE(__val) == string); \
+						if (!__s || !*__s) \
+							break; \
+						else \
+							__l = strlen(__s) + 1; \
+						void *__p = io_realloc(__val->val.string, __l); \
 						if (__p) { \
+							AIT_LEN(__val) = __l; \
 							__val->val.string = __p; \
-							AIT_LEN(__val) = strlen((_v)) + 1; \
-							strlcpy((char*) __val->val.string, (_v), \
+							strlcpy((char*) __val->val.string, __s, \
 									AIT_LEN(__val)); \
 						} } while (0)
+#define AIT_SET_STRLCPY(_vl, _v, _len)	do { ait_val_t *__val = (_vl); const char *__s = (_v); \
+						assert(__val); assert(AIT_TYPE(__val) == string); \
+						if (!__s || !*__s) \
+							break; \
+						void *__p = io_realloc(__val->val.string, _len); \
+						if (__p) { \
+							AIT_LEN(__val) = _len; \
+							__val->val.string = __p; \
+							strlcpy((char*) __val->val.string, __s, \
+									AIT_LEN(__val)); \
+						} } while (0)
 #define AIT_SET_BLOB(_vl, _n, _len)	do { ait_val_t *__val = (_vl); assert(__val); \
 						__val->val_type = blob; __val->val.blob = _n; \
 						AIT_LEN(__val) = _len; } while (0)
@@ -285,26 +310,27 @@ typedef struct {
 						__val->val_type = f64; __val->val.f64 = _n; \
 						AIT_LEN(__val) = sizeof(double); } while (0)
 
-#define AIT_COPY_VAL(_vl, _v)		do { memcpy((_vl), (_v), sizeof(ait_val_t)); \
-						switch (AIT_TYPE((_vl))) { \
+#define AIT_COPY_VAL(_vl, _v)		do { ait_val_t *__val = (_vl); assert(__val); \
+						memcpy(__val, (_v), sizeof(ait_val_t)); \
+						switch (AIT_TYPE(__val)) { \
 							case buffer: \
-								AIT_SET_BUF((_vl), \
+								AIT_SET_BUF(__val, \
 										AIT_GET_BUF((_v)), \
 										AIT_LEN((_v))); \
 								break; \
 							case string: \
-								AIT_SET_STR((_vl), \
+								AIT_SET_STR(__val, \
 										AIT_GET_STR((_v))); \
 								break; \
+							case data: \
+								AIT_SET_DATA(__val, \
+										AIT_GET_DATA((_v)), \
+										AIT_LEN((_v))); \
+								break; \
 							default: \
 								break; \
 						} \
 					} 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))); \
-					} while (0)
 
 #define AIT_INIT_VAL(_vl)		(memset((_vl), 0, sizeof(ait_val_t)))
 #define AIT_INIT_VAL2(_vl, _t)		do { \
@@ -342,16 +368,15 @@ typedef struct {
 									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];
@@ -503,6 +528,15 @@ inline ait_val_t *io_allocVar(void);
  * return: none
  */
 inline void io_freeVar(ait_val_t ** __restrict val);
+/*
+ * io_makeVar() - Allocate memory and fill variable
+ *
+ * @type = type of variable
+ * @... = arg1 is value of variable
+ * @... = arg2 is length of variabla. Not required for numbers and strings!
+ * return: NULL error or new variable, after use free variable with io_freeVar()
+ */
+ait_val_t *io_makeVar(ait_type_t type, ...);
 /*
  * io_allocVars() - Allocate ait_val_t array
  *