--- libaitio/src/Attic/array.c 2012/07/03 08:51:05 1.10 +++ libaitio/src/Attic/array.c 2012/08/01 00:37:08 1.11 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: array.c,v 1.10 2012/07/03 08:51:05 misho Exp $ +* $Id: array.c,v 1.11 2012/08/01 00:37:08 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -467,28 +467,6 @@ io_arrayCopy(array_t ** __restrict dest, array_t * __r } /* - * io_argsNum() Parse and calculate number of arguments - * - * @csArgs = Input arguments line - * @csDelim = Delimiter(s) for separate - * return: 0 error format; -1 error:: can`t read; >0 ok, number of items - */ -inline int -io_argsNum(const char *csArgs, const char *csDelim) -{ - register int res; - char *pos; - - assert(csArgs); - assert(csDelim); - if (!csArgs || !csDelim) - return -1; - - for (res = 1, pos = (char*) csArgs; (pos = strpbrk(pos, csDelim)); res++, pos++); - return res; -} - -/* * io_arrayMake() Parse and make array from arguments ... (input string will be modified!!! * and output array must be free with io_arrayDestroy() after use!) * @@ -524,50 +502,3 @@ io_arrayMake(char * __restrict psArgs, int nargs, cons **app ? i++ : i, **app ? app++ : app); return i; } - -/* - * io_MakeAV() Parse and make attribute/value pair - * - * @csArgs = Input argument line - * @csDelim = Delimiter for separate - * @psAttr = Output Attribute - * @attrLen = Size of attribute array - * @psValue = Output Value, if ==NULL this element not present value or not wanted for return - * @valLen = Size of value array - * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items -*/ -int -io_MakeAV(const char * __restrict csArgs, const char *csDelim, - char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen) -{ - register int ret = 0; - char *pos, *psBuf; - - if (!csArgs || !csDelim || !psAttr || !attrLen) - return -1; - if (psValue && !valLen) - return -1; - else - memset(psValue, 0, valLen); - psBuf = io_strdup(csArgs); - if (!psBuf) { - LOGERR; - return -1; - } - - pos = strpbrk(psBuf, csDelim); - if (pos) - *pos++ = 0; - ret++; - strlcpy(psAttr, psBuf, attrLen); - - if (pos && *pos) { - ret++; - if (psValue) - strlcpy(psValue, pos, valLen); - } - - io_free(psBuf); - return ret; -} -