--- libaitio/src/Attic/tools.c	2010/04/16 13:25:27	1.2
+++ libaitio/src/Attic/tools.c	2010/09/10 12:39:41	1.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: tools.c,v 1.2 2010/04/16 13:25:27 misho Exp $
+* $Id: tools.c,v 1.3 2010/09/10 12:39:41 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -15,7 +15,7 @@
  * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes
 */
-inline int io_LTrimStr(u_char *psLine)
+inline int io_LTrimStr(u_char * __restrict psLine)
 {
 	int pos = 0;
 	u_char *s;
@@ -35,7 +35,7 @@ inline int io_LTrimStr(u_char *psLine)
  * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes
 */
-inline int io_RTrimStr(u_char *psLine)
+inline int io_RTrimStr(u_char * __restrict psLine)
 {
 	u_char *t, *pos;
 
@@ -54,7 +54,7 @@ inline int io_RTrimStr(u_char *psLine)
  * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes
 */
-inline int io_TrimStr(u_char *psLine)
+inline int io_TrimStr(u_char * __restrict psLine)
 {
 	int ret = 0;
 
@@ -69,7 +69,7 @@ inline int io_TrimStr(u_char *psLine)
  * @psLine = Text string
  * return: 0 nothing to do; 1 successful unquoted string
 */
-inline int io_UnquotStr(u_char *psLine)
+inline int io_UnquotStr(u_char * __restrict psLine)
 {
 	char *pos, *str = NULL;
 	int flg;
@@ -97,30 +97,30 @@ inline int io_UnquotStr(u_char *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(u_char *psLine, int lineLen)
+inline u_char *io_Ch2Hex(u_char *psLine, int lineLen)
 {
 	register int i;
-	char szWork[3], *str;
+	char szWork[3];
+	u_char *str;
 
 	if (!psLine || !*psLine || !lineLen)
 		return NULL;
 
-	str = malloc(lineLen * 2 + 1);
+	str = malloc(lineLen / 2);
 	if (!str) {
 		LOGERR;
 		return NULL;
 	} else
-		memset(str, 0, lineLen * 2 + 1);
+		memset(str, 0, lineLen / 2);
 
-	for (i = 0; i < lineLen && psLine[i]; i++) {
-		memset(szWork, 0, 3);
-		snprintf(szWork, 3, "%02X", (u_char) psLine[i]);
-		strncat(str, szWork, 2);
+	for (i = 0; i < lineLen && psLine[i * 2]; i++) {
+		strlcpy(szWork, (char*) &psLine[i * 2], 3);
+		str[i] = (u_char) strtol(szWork, NULL, 16);
 	}
 
 	return str;
@@ -128,12 +128,12 @@ inline char *io_Char2Hex(u_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(u_char *psLine, int lineLen)
+inline char *io_Hex2Ch(u_char *psLine, int lineLen)
 {
 	register int i;
 	char szWork[3], *str;
@@ -141,16 +141,17 @@ inline char *io_Hex2Char(u_char *psLine, int lineLen)
 	if (!psLine || !*psLine || !lineLen)
 		return NULL;
 
-	str = malloc(lineLen / 2 + 1);
+	str = malloc(lineLen * 2 + 1);
 	if (!str) {
 		LOGERR;
 		return NULL;
 	} else
-		memset(str, 0, lineLen / 2 + 1);
+		memset(str, 0, lineLen * 2 + 1);
 
-	for (i = 0; i < lineLen && psLine[i * 2]; i++) {
-		strlcpy(szWork, (char*) &psLine[i * 2], 3);
-		str[i] = (char) strtol(szWork, NULL, 16);
+	for (i = 0; i <= lineLen; i++) {
+		memset(szWork, 0, 3);
+		snprintf(szWork, 3, "%02X", (u_char) psLine[i]);
+		strncat(str, szWork, 2);
 	}
 
 	return str;