--- libaitio/inc/aitio.h 2011/05/03 14:59:01 1.8.2.5 +++ libaitio/inc/aitio.h 2011/08/25 13:50:16 1.10.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.8.2.5 2011/05/03 14:59:01 misho Exp $ +* $Id: aitio.h,v 1.10.2.1 2011/08/25 13:50:16 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -219,25 +219,45 @@ inline char *io_Hex2Ch(unsigned char *psLine, int line */ inline array_t *io_arrayInit(int numItems); /* - * io_arrayDestroy() - Free all data in dynamic array and Destroy dynamic array + * io_arrayDestroy() - Free and destroy dynamic array * @parr = Array * return: none */ inline void io_arrayDestroy(array_t ** __restrict parr); /* - * io_arrayFree() - Free all data in dynamic array + * io_arrayFree() - Free all data in dynamic array items * (WARNING! If assign static array dont use this!!!) * @arr = Array * return: none */ inline void io_arrayFree(array_t * __restrict arr); /* + * io_arrayFrom() - Create and fill array from array with pointers + * @pargv = Array with pointers + * @argc = Number of Items, if 0 walk through argv and stop when reach NULL item + * return: NULL error, != NULL allocated new array + */ +inline array_t *io_arrayFrom(const char *** __restrict pargv, int argc); +/* + * io_arrayTo() - Create and fill array with pointers from dynamic array + * @arr = Array + * return: NULL error, != NULL allocated memory for array, NULL terminated + */ +inline char **io_arrayTo(array_t * __restrict arr); +/* * io_arrayLen() - Get last used element in dynamic array (array Length) * @arr = Array * return: -1 error, 0 empty or >0 position of last used element */ inline int io_arrayLen(array_t * __restrict arr); /* + * io_arrayConcat() Concat source array to destination array + * @dest = Destination array + * @src = Source array + * return: -1 error; >0 new count of destination array + */ +int io_arrayConcat(array_t * __restrict dest, array_t * __restrict src); +/* * io_arrayGrow() - Grow/Shrink dynamic array, Use with care when it shrink!!! * @arr = Array * @newNumItems = Number of Items @@ -260,6 +280,12 @@ int io_arrayVacuum(array_t * __restrict arr, int fromW assert(_arr && _arr->arr_num > _d); \ *(_arr->arr_data + _d) = (void*) _ptr; \ } while (0) +#define io_arrayDel(_arr, _d, _fri) do { \ + assert(_arr && _arr->arr_num > _d); \ + if (_fri) \ + free(*(_arr->arr_data + _d)); \ + *(_arr->arr_data + _d) = NULL; \ + } while (0) /* * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position @@ -271,7 +297,7 @@ inline int io_arrayPush(array_t * __restrict arr, void /* * io_arrayPop() - Pop element from dynamic array like stack manner, last used position * @arr = Array - * @data = Element, if set NULL return only first empty position + * @data = Element, if set NULL return only last used position * @delAfter = Delete after Pop element, !=0 delete element from array after return data * return: -1 not found used position, array is empty!, >-1 return element position */ @@ -345,6 +371,14 @@ inline int io_sarrVacuum(sarr_t * __restrict arr); */ inline void *io_sarrGet(sarr_t * __restrict arr, unsigned int idx); /* + * io_sarrGet2() - Always get element from dynamic split-order array + * Function automatic grow array. Good use for Hash tables! + * @arr = Array + * @idx = Index (warning 1st element is at position 1) + * return: NULL not found, !=NULL element + */ +void *io_sarrGet2(sarr_t * __restrict arr, unsigned int idx); +/* * io_sarrSet() - Set element to dynamic split-order array * @arr = Array * @idx = Index (warning 1st element is at position 1) @@ -354,6 +388,26 @@ inline void *io_sarrGet(sarr_t * __restrict arr, unsig inline void *io_sarrSet(sarr_t * __restrict arr, unsigned int idx, void *data); #define io_sarrDel(_arr, _idx) io_sarrSet(_arr, _idx, NULL) #define io_sarr(_arr, _idx, _type) (_type)io_sarrGet(_arr, _idx) + +/* + * io_CopyEnv() Copy environment to new environment array; + * @oldenv = Environment array + * return: NULL error; !=NULL Allocated new environment array(must be free) +*/ +char **io_CopyEnv(const char **oldenv); +/* + * io_ExecArgs() Build exec arguments from other array + * @psProg = Program name for execute + * @oldarg = Arguments array + * return: NULL error; !=NULL Allocated execution array(must be free) +*/ +char **io_ExecArgs(const char *psProg, const char **oldarg); +/* + * io_FreeNullTerm() Free dynamic allocated null terminated array with strings + * @arr = Pointer to array for free + * return: none +*/ +inline void io_FreeNullTerm(char *** __restrict arr); /* * ioURLGet() Parse and get data from input URL