--- libaitio/src/bufio.c	2012/07/03 08:51:05	1.6
+++ libaitio/src/bufio.c	2013/03/13 14:54:39	1.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: bufio.c,v 1.6 2012/07/03 08:51:05 misho Exp $
+* $Id: bufio.c,v 1.7 2013/03/13 14:54:39 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -62,11 +62,11 @@ cf_(struct tagBufIO *buf)
 	}
 
 	if (buf->buf_mode == BUFIO_MODE_INFINIT)
-		io_free(buf->buf_base);
+		e_free(buf->buf_base);
 	else if (buf->buf_unmap)
 		buf->buf_unmap(buf);
 
-	io_free(buf);
+	e_free(buf);
 	return 0;
 }
 
@@ -157,7 +157,7 @@ sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
 			if (pos < 0)
 				goto err;
 			if (buf->buf_size < pos) {
-				b = io_realloc(buf->buf_base, pos);
+				b = e_realloc(buf->buf_base, pos);
 				if (!b) {
 					LOGERR;
 					return -1;
@@ -173,7 +173,7 @@ sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
 			if ((buf->buf_offset + pos) < 0)
 				goto err;
 			if (buf->buf_size < (buf->buf_offset + pos)) {
-				b = io_realloc(buf->buf_base, buf->buf_offset + pos);
+				b = e_realloc(buf->buf_base, buf->buf_offset + pos);
 				if (!b) {
 					LOGERR;
 					return -1;
@@ -190,7 +190,7 @@ sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
 			if ((buf->buf_size + pos) < 0)
 				goto err;
 			if (buf->buf_size < (buf->buf_size + pos)) {
-				b = io_realloc(buf->buf_base, buf->buf_size + pos);
+				b = e_realloc(buf->buf_base, buf->buf_size + pos);
 				if (!b) {
 					LOGERR;
 					return -1;
@@ -224,7 +224,7 @@ wf_inf(struct tagBufIO *buf, const char *dat, int siz)
 	}
 
 	if (buf->buf_offset + siz > buf->buf_size) {
-		b = io_realloc(buf->buf_base, buf->buf_offset + siz);
+		b = e_realloc(buf->buf_base, buf->buf_offset + siz);
 		if (!b) {
 			LOGERR;
 			return -1;
@@ -260,7 +260,7 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 		return NULL;
 	}
 
-	buf = io_malloc(sizeof(struct tagBufIO));
+	buf = e_malloc(sizeof(struct tagBufIO));
 	if (!buf) {
 		LOGERR;
 		return NULL;
@@ -268,10 +268,10 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 		memset(buf, 0, sizeof(struct tagBufIO));
 
 	if (!*base) {
-		*base = io_malloc(basesize);
+		*base = e_malloc(basesize);
 		if (!*base) {
 			LOGERR;
-			io_free(buf);
+			e_free(buf);
 			return NULL;
 		} else
 			memset(*base, 0, basesize);
@@ -309,10 +309,10 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 	if (!f) {
 		LOGERR;
 		if (buf->buf_mode == BUFIO_MODE_INFINIT) {
-			io_free(*base);
+			e_free(*base);
 			*base = NULL;
 		}
-		io_free(buf);
+		e_free(buf);
 		return NULL;
 	}
 
@@ -373,7 +373,7 @@ io_fmapopen(const char *csFile, int mode, int perm, in
 	}
 
 
-	buf = io_malloc(sizeof(struct tagBufIO));
+	buf = e_malloc(sizeof(struct tagBufIO));
 	if (!buf) {
 		LOGERR;
 		munmap(base, basesize);
@@ -399,7 +399,7 @@ io_fmapopen(const char *csFile, int mode, int perm, in
 #endif
 	if (!f) {
 		LOGERR;
-		io_free(buf);
+		e_free(buf);
 		munmap(base, basesize);
 		return NULL;
 	}