--- libaitio/inc/aitio.h	2010/04/16 13:33:00	1.4.2.1
+++ libaitio/inc/aitio.h	2010/09/07 17:08:39	1.4.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.4.2.1 2010/04/16 13:33:00 misho Exp $
+* $Id: aitio.h,v 1.4.2.6 2010/09/07 17:08: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
@@ -189,6 +189,47 @@ int ioURLGetValue(struct tagIOURL *url, const char *cs
  * return: -1 error:: can`t read; 0 ok
 */
 int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);
+
+
+/*
+ * io_rread() Raw VFS read function
+ * @fd = File handle
+ * @buf = Read buffer
+ * @nbytes = Read buffer size
+ * @offset = Read from position, if -1 read nbytes from current position
+ * @update = Update file handle position !0
+ * return: -1 error or !=-1 readed bytes
+ */
+inline int io_rread(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update);
+/*
+ * io_rwrite() Raw VFS write function
+ * @fd = File handle
+ * @buf = Write buffer
+ * @nbytes = Write bytes from buffer
+ * @offset = Write at position, if -1 write nbytes from current position
+ * @update = Update file handle position !0
+ * return: -1 error or !=-1 writed bytes
+ */
+inline int io_rwrite(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update);
+
+/* 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)
 
 
 #endif