--- libaitwww/src/tools.c	2012/09/20 14:19:45	1.4
+++ libaitwww/src/tools.c	2013/05/26 20:30:43	1.4.4.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: tools.c,v 1.4 2012/09/20 14:19:45 misho Exp $
+* $Id: tools.c,v 1.4.4.2 2013/05/26 20:30:43 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
@@ -103,7 +103,7 @@ www_cmptype(const char *ct, const char *type)
  *
  * @str = query string
  * @delim = delimiter
- * return: NULL error or AV pair, must be io_free() after use!
+ * return: NULL error or AV pair, must be e_free() after use!
  */
 ait_val_t *
 www_getpair(char ** __restrict str, const char *delim)
@@ -114,9 +114,9 @@ www_getpair(char ** __restrict str, const char *delim)
 
 	assert(str && *str && delim);
 
-	s = io_allocVar();
+	s = ait_allocVar();
 	if (!s) {
-		www_SetErr(io_GetErrno(), "%s", io_GetError());
+		www_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
 		return NULL;
 	}
 
@@ -137,7 +137,7 @@ www_getpair(char ** __restrict str, const char *delim)
  * @str = string
  * return: digit
  */
-inline char
+char
 www_x2c(const char *str)
 {
 	register char digit;
@@ -157,7 +157,7 @@ www_x2c(const char *str)
  * @str = string
  * return: none
  */
-inline void
+void
 www_unescape(char * __restrict str)
 {
 	register int i, j;
@@ -183,7 +183,7 @@ www_unescape(char * __restrict str)
  * www_undot() - Undotted and clean WWW query filename
  *
  * @pname = query filename
- * return: =NULL error or !=NULL allocated valid filename, after use you must call io_freeVar()
+ * return: =NULL error or !=NULL allocated valid filename, after use you must call ait_freeVar()
  */
 ait_val_t *
 www_undot(const char * __restrict pname)
@@ -198,9 +198,9 @@ www_undot(const char * __restrict pname)
 	if (*pname != '/')
 		return NULL;
 
-	v = io_allocVar();
+	v = ait_allocVar();
 	if (!v) {
-		www_SetErr(io_GetErrno(), "%s", io_GetError());
+		www_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
 		return NULL;
 	} else {
 		AIT_SET_STR(v, pname + 1);
@@ -249,7 +249,7 @@ www_undot(const char * __restrict pname)
 	/* check for valid filename */
 	if (*fname == '/' || (fname[0] == '.' && fname[1] == '.' && 
 				(!fname[2] || fname[2] == '/'))) {
-		io_freeVar(&v);
+		ait_freeVar(&v);
 		return NULL;
 	}