--- libaitio/inc/aitio.h	2010/07/05 11:01:56	1.4.2.3
+++ libaitio/inc/aitio.h	2010/09/08 18:12:39	1.4.2.13
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.4.2.3 2010/07/05 11:01:56 misho Exp $
+* $Id: aitio.h,v 1.4.2.13 2010/09/08 18:12:39 misho Exp $
 *
 *************************************************************************/
 #ifndef __AITIO_H
@@ -150,19 +150,19 @@ inline int io_RTrimStr(unsigned char * __restrict psLi
 */
 inline int io_TrimStr(unsigned char * __restrict psLine);
 /*
- * io_Char2Hex() Convert from Char string to Hex string
+ * io_Ch2Hex() Convert from Char string to Hex string
  * @psLine = Text string
  * @lineLen = Length of Text string
- * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free)
+ * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be free)
 */
-inline char *io_Char2Hex(unsigned char *psLine, int lineLen);
+inline unsigned char *io_Ch2Hex(unsigned char *psLine, int lineLen);
 /*
- * io_Hex2Char() Convert from Hex string to Char string
+ * io_Hex2Ch() Convert from Hex string to Char string
  * @psLine = Text string
  * @lineLen = Length of Text string
  * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free)
 */
-inline char *io_Hex2Char(unsigned char *psLine, int lineLen);
+inline char *io_Hex2Ch(unsigned char *psLine, int lineLen);
 
 /*
  * ioURLGet() Parse and get data from input URL
@@ -215,6 +215,41 @@ inline int io_rwrite(int fd, void * __restrict buf, si
 /* Disk I/O helper macros */
 #define io_read(f, b, n) io_rread(f, b, n, -1, 1)
 #define io_write(f, b, n) io_rwrite(f, b, n, -1, 1)
+
+
+/* Debug helper macros */
+extern int io_Debug;
+
+#define io_initDebug(x)		io_Debug = (x);
+#define io_addDebug		io_Debug++
+#define ioDEBUG(x, fmt, ...)	do { \
+					assert((fmt)); \
+					char str[STRSIZ] = { 0 }; \
+					snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \
+					if ((x) <= io_Debug) \
+						syslog(LOG_DEBUG, "ioDebug(%d):%s(%d): %s\n", \
+								(x), __func__, __LINE__, str); \
+				} while (0)
+
+#define ioERROR(x, fmt, ...)	do { \
+					assert((fmt)); \
+					char str[STRSIZ] = { 0 }; \
+					snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \
+					syslog(LOG_ERR, "ioError():%s(%d): #%d - %s\n", \
+							 __func__, __LINE__, (x), str); \
+				} while (0)
+#define io_sysERROR(x)		do { \
+					if (x > 0 || errno) \
+						syslog(LOG_ERR, "ioError(sys):%s(%d): #%d - %s\n", \
+								__func__, __LINE__, x > 0 ? x : errno, \
+								strerror(x > 0 ? x : errno)); \
+				} while (0)
+#define io_aitERROR(ait)	do { \
+					if (ait##_GetErrno()) \
+						syslog(LOG_ERR, "ioError(ait):%s(%d): #%d - %s\n", \
+								__func__, __LINE__, ait##_GetErrno(), \
+								ait##_GetError()); \
+				} while (0)
 
 
 #endif