--- libelwix/inc/elwix/avar.h	2019/08/16 15:29:51	1.10.42.2
+++ libelwix/inc/elwix/avar.h	2019/09/04 10:41:36	1.10.42.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: avar.h,v 1.10.42.2 2019/08/16 15:29:51 misho Exp $
+* $Id: avar.h,v 1.10.42.3 2019/09/04 10:41:36 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -304,15 +304,16 @@ typedef struct __packed {
 								AIT_SET_STR((_vl), \
 										AIT_GET_STR((_v))); \
 								break; \
-							case data: \
-								AIT_SET_DATA((_vl), \
-										AIT_GET_DATA((_v)), \
-										AIT_LEN((_v))); \
-								break; \
 							default: \
 								break; \
 						} \
 					} while (0)
+/* Additional helper macro, which can help about copy data variables */
+#define AIT_COPY_DATA(_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_VAL_INITIALIZER(_vl)	{ .val_type = empty, { .val_opt = 0 }, \
 						.val_key = 0, .val_len = 0, \
@@ -331,23 +332,19 @@ typedef struct __packed {
 								if (!__val->val_in && \
 										__val->val.buffer) \
 									e_free(__val->val.buffer); \
+								__val->val.buffer = NULL; \
 								break; \
 							case string: \
 								if (!__val->val_in && \
 										__val->val.string) \
 									e_free(__val->val.string); \
+								__val->val.string = NULL; \
 								break; \
-							case data: \
-								if (!__val->val_in) \
-									memset(__val->val_data, 0, \
-											AIT_LEN(__val)); \
-								break; \
 							default: \
 								break; \
 						} \
 						__val->val_type = empty; \
 						__val->val_opt ^= __val->val_opt; \
-						__val->val.net ^= __val->val.net; \
 						AIT_LEN(__val) = 0; \
 						AIT_KEY(__val) = 0; \
 					} while (0)