--- libaitio/inc/aitio.h	2011/12/13 02:23:07	1.13
+++ libaitio/inc/aitio.h	2011/12/13 10:40:05	1.13.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.13 2011/12/13 02:23:07 misho Exp $
+* $Id: aitio.h,v 1.13.2.3 2011/12/13 10:40:05 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -334,6 +334,17 @@ int io_vars2map(unsigned char *buf, int buflen, array_
 array_t *io_map2vars(unsigned char *buf, int buflen, int vnum, int zcpy);
 
 /*
+ * io_allocVar() Allocate memory for variable
+ * return: NULL error or new variable, after use free variable with io_freeVar()
+ */
+inline ait_val_t *io_allocVar(void);
+/*
+ * io_freeVar() Free allocated memory for variable
+ * @val = Variable
+ * return: none
+ */
+inline void io_freeVar(ait_val_t ** __restrict val);
+/*
  * io_allocVars() Allocate ait_val_t array
  * @varnum = Number of variables
  * return: =NULL error or !=NULL allocated array
@@ -352,8 +363,6 @@ inline int io_clrVars(array_t * __restrict vars);
  */
 inline void io_freeVars(array_t ** __restrict vars);
 
-#define io_elemVars(_vars, _n, _val)	((ait_val_t*) io_arrayElem((_vars), \
-							(_n), (void**) (_val)))
 
 /*
  * ioPromptRead() Read data from input h[0] with prompt to output h[1]
@@ -553,7 +562,7 @@ int io_arrayVacuum(array_t * __restrict arr, int fromW
  * @data = Element, if set NULL GET element at position or !=NULL PUT element at position
  * return: -1 error or !=-1 return element at position
  */
-inline void *io_arrayElem(array_t * __restrict arr, int n, void **data);
+inline void *io_arrayElem(array_t * __restrict arr, int n, void *data);
 /*
  * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position
  * @arr = Array
@@ -781,33 +790,48 @@ inline int io_rwrite(int fd, void * __restrict buf, si
 /* Debug helper macros */
 extern int io_Debug;
 
-#define io_initDebug(x)		io_Debug = (x);
-#define io_addDebug		io_Debug++
+#define io_initDebug(x)		(io_Debug = (x))
+#define io_incDebug		(io_Debug++)
+#define io_decDebug		(io_Debug--)
+
+/* Debug macros */
+#define ioTRACE(x)		if ((x) <= io_Debug) \
+					   syslog(LOG_DEBUG, "I'm in %s(%d)", __func__, __LINE__)
 #define ioDEBUG(x, fmt, ...)	do { \
 					assert((fmt)); \
 					char str[STRSIZ] = { 0 }; \
 					snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \
 					if ((x) <= io_Debug) \
-						syslog(LOG_DEBUG, "ioDebug(%d):%s(%d): %s\n", \
+						syslog(LOG_DEBUG, "Debug(%d):%s(%d): %s\n", \
 								(x), __func__, __LINE__, str); \
 				} while (0)
 
+/* Logger macro */
+#define ioLOGGER(x, fmt, ...)	do { \
+					assert((fmt)); \
+					char str[STRSIZ] = { 0 }; \
+					snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \
+					syslog((x), "Logger:%s(%d): %s\n", \
+								__func__, __LINE__, str); \
+				} while (0)
+
+/* Error state macros */
 #define ioERROR(x, fmt, ...)	do { \
 					assert((fmt)); \
 					char str[STRSIZ] = { 0 }; \
 					snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \
-					syslog(LOG_ERR, "ioError():%s(%d): #%d - %s\n", \
+					syslog(LOG_ERR, "Error:%s(%d): #%d - %s\n", \
 							 __func__, __LINE__, (x), str); \
 				} while (0)
-#define io_sysERROR(x)		do { \
+#define ioLOGERR(x)		do { \
 					if (x > 0 || errno) \
-						syslog(LOG_ERR, "ioError(sys):%s(%d): #%d - %s\n", \
+						syslog(LOG_ERR, "Error(sys):%s(%d): #%d - %s\n", \
 								__func__, __LINE__, x > 0 ? x : errno, \
 								strerror(x > 0 ? x : errno)); \
 				} while (0)
-#define io_aitERROR(ait)	do { \
+#define ioLIBERR(ait)		do { \
 					if (ait##_GetErrno()) \
-						syslog(LOG_ERR, "ioError(ait):%s(%d): #%d - %s\n", \
+						syslog(LOG_ERR, "Error(lib):%s(%d): #%d - %s\n", \
 								__func__, __LINE__, ait##_GetErrno(), \
 								ait##_GetError()); \
 				} while (0)