--- libaitio/src/Attic/tools.c 2010/04/16 13:37:25 1.2.2.1 +++ libaitio/src/Attic/tools.c 2010/09/10 12:39:41 1.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tools.c,v 1.2.2.1 2010/04/16 13:37:25 misho Exp $ +* $Id: tools.c,v 1.3 2010/09/10 12:39:41 misho Exp $ * *************************************************************************/ #include "global.h" @@ -97,30 +97,30 @@ inline int io_UnquotStr(u_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(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;