--- libaitio/src/Attic/tools.c	2012/03/29 01:31:34	1.10
+++ libaitio/src/Attic/tools.c	2012/05/14 12:49:21	1.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: tools.c,v 1.10 2012/03/29 01:31:34 misho Exp $
+* $Id: tools.c,v 1.11 2012/05/14 12:49:21 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -48,56 +48,56 @@ SUCH DAMAGE.
 
 
 /*
- * io_LTrimStr() Remove left whitespaces from text string
+ * io_LTrimStr() - Remove left whitespaces from text string
  *
  * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes
 */
 inline int
-io_LTrimStr(u_char * __restrict psLine)
+io_LTrimStr(char * __restrict psLine)
 {
 	int pos = 0;
-	u_char *s;
+	char *s;
 
 	if (!psLine || !*psLine)
 		return 0;
 
-	for (s = psLine; isspace(*s); s++);
+	for (s = psLine; isspace((u_char) *s); s++);
 	pos = s - psLine;
 
-	memmove(psLine, s, (strlen((char*) psLine) - pos) + 1);
+	memmove(psLine, s, (strlen(psLine) - pos) + 1);
 	return pos;
 }
 
 /*
- * io_RTrimStr() Remove right whitespaces from text string
+ * io_RTrimStr() - Remove right whitespaces from text string
  *
  * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes
 */
 inline int
-io_RTrimStr(u_char * __restrict psLine)
+io_RTrimStr(char * __restrict psLine)
 {
-	u_char *t, *pos;
+	char *t, *pos;
 
 	if (!psLine || !*psLine)
 		return 0;
 
-	pos = psLine + strlen((char*) psLine);
-	for (t = pos - 1; t > psLine && isspace(*t); t--);
+	pos = psLine + strlen(psLine);
+	for (t = pos - 1; t > psLine && isspace((u_char) *t); t--);
 	*++t = 0;
 
 	return pos - t;
 }
 
 /*
- * io_TrimStr() Remove left and right whitespaces from text string
+ * io_TrimStr() - Remove left and right whitespaces from text string
  *
  * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes
 */
 inline int
-io_TrimStr(u_char * __restrict psLine)
+io_TrimStr(char * __restrict psLine)
 {
 	int ret = 0;
 
@@ -108,13 +108,13 @@ io_TrimStr(u_char * __restrict psLine)
 }
 
 /*
- * io_UnquotStr() Remove quots from input text string 
+ * io_UnquotStr() - Remove quots from input text string 
  *
  * @psLine = Text string
  * return: 0 nothing to do; 1 successful unquoted string
 */
 inline int
-io_UnquotStr(u_char * __restrict psLine)
+io_UnquotStr(char * __restrict psLine)
 {
 	char *pos, *str = NULL;
 	int flg;
@@ -122,27 +122,24 @@ io_UnquotStr(u_char * __restrict psLine)
 	if (!psLine)
 		return 0;
 
-	switch (*psLine) {
-		case '`':
-		case '"':
-		case '\'':
-			str = strdup((char*) psLine + 1);
-			for (pos = str, flg = 0; *pos; flg = ('\\' == *pos), pos++) {
-				if (!flg && *pos == *psLine) {
-					*pos = 0;
-					strlcpy((char*) psLine, str, strlen((char*) psLine) + 1);
-					break;
-				}
+	if (*psLine == '"' || *psLine == '\'') {
+		str = strdup(psLine + 1);
+		for (pos = str, flg = 0; *pos; flg = ('\\' == *pos), pos++) {
+			if (!flg && *pos == *psLine) {
+				*pos = 0;
+				strlcpy(psLine, str, strlen(psLine) + 1);
+				break;
 			}
-			free(str);
-			return 1;
+		}
+		free(str);
+		return 1;
 	}
 
 	return 0;
 }
 
 /*
- * io_Ch2Hex() Convert from Char string to Hex string
+ * io_Ch2Hex() - Convert from Char string to Hex string
  *
  * @psLine = Text string
  * @lineLen = Length of Text string
@@ -175,7 +172,7 @@ io_Ch2Hex(u_char *psLine, int lineLen)
 
 
 /*
- * io_Hex2Ch() Convert from Hex string to Char string
+ * io_Hex2Ch() - Convert from Hex string to Char string
  *
  * @psLine = Text string
  * @lineLen = Length of Text string
@@ -207,7 +204,7 @@ io_Hex2Ch(u_char *psLine, int lineLen)
 }
 
 /*
- * io_CopyEnv() Copy environment to new environment array;
+ * io_CopyEnv() - Copy environment to new environment array;
  *
  * @oldenv = Environment array
  * return: NULL error; !=NULL Allocated new environment array(must be free)
@@ -247,7 +244,7 @@ io_CopyEnv(const char **oldenv)
 }
 
 /*
- * io_ExecArgs() Build exec arguments from other array
+ * io_ExecArgs() - Build exec arguments from other array
  *
  * @psProg = Program name for execute
  * @oldarg = Arguments array
@@ -286,7 +283,7 @@ io_ExecArgs(const char *psProg, const char **oldarg)
 }
 
 /*
- * io_FreeNullTerm() Free dynamic allocated null terminated array with strings
+ * io_FreeNullTerm() - Free dynamic allocated null terminated array with strings
  *
  * @arr = Pointer to array for free
  * return: none
@@ -350,7 +347,7 @@ io_Path2File(const char * __restrict csArgs, char * __
 }
 
 /*
- * io_ether_ntoa() Convert ethernet address to string
+ * io_ether_ntoa() - Convert ethernet address to string
  *
  * @n = ethernet address structure, like struct ether_addr
  * @a = string
@@ -374,7 +371,7 @@ io_ether_ntoa(const struct io_ether_addr *n, char * __
 }
 
 /*
- * io_ether_aton() Convert string to ethernet address
+ * io_ether_aton() - Convert string to ethernet address
  *
  * @a = string
  * @e = ethernet address structure, like struct ether_addr
@@ -404,7 +401,7 @@ io_ether_aton(const char *a, struct io_ether_addr *e)
 }
 
 /*
- * io_n2port() Extract port from network structure
+ * io_n2port() - Extract port from network structure
  *
  * @addr = Address
  * return: 0 not supported family type or port number
@@ -432,7 +429,7 @@ io_n2port(io_sockaddr_t * __restrict addr)
 }
 
 /*
- * io_n2addr() Extract address from network structure
+ * io_n2addr() - Extract address from network structure
  *
  * @addr = Address
  * @val = Value for store string address
@@ -468,14 +465,12 @@ io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t *
 			return ret;
 	}
 
-	if (!AIT_ISEMPTY(val))
-		AIT_FREE_VAL(val);
 	AIT_SET_STR(val, ret);
 	return (const char*) AIT_GET_STR(val);
 }
 
 /*
- * io_gethostbyname() Get host and port and make network structure
+ * io_gethostbyname() - Get host and port and make network structure
  *
  * @psHost = Hostname
  * @port = Port