--- libaitio/src/Attic/array.c 2011/04/19 22:32:16 1.1.2.3 +++ libaitio/src/Attic/array.c 2011/05/19 02:22:46 1.2.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: array.c,v 1.1.2.3 2011/04/19 22:32:16 misho Exp $ +* $Id: array.c,v 1.2.4.1 2011/05/19 02:22:46 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -27,11 +27,11 @@ are met: must display the following acknowledgement: This product includes software developed by Michael Pounov ELWIX - Embedded LightWeight unIX and its contributors. -4. Neither the name of the University nor the names of its contributors +4. Neither the name of AITNET nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE @@ -75,7 +75,7 @@ io_arrayInit(int numItems) } /* - * 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 @@ -97,7 +97,7 @@ io_arrayFree(array_t * __restrict arr) } /* - * io_arrayDestroy() - Free all data in dynamic array and Destroy dynamic array + * io_arrayDestroy() - Free and destroy dynamic array * @parr = Array * return: none */ @@ -222,6 +222,83 @@ io_arrayVacuum(array_t * __restrict arr, int fromWhere } return cx; +} + +/* + * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position + * @arr = Array + * @data = Element, if set NULL return only first empty position + * return: -1 not found empty position, array is full!, >-1 return position of stored element into array + */ +inline int +io_arrayPush(array_t * __restrict arr, void **data) +{ + register int i; + int ret = -1; + + assert(arr); + + for (i = 0; i < arr->arr_num; i++) + if (!arr->arr_data[i]) { + if (data) + arr->arr_data[i] = *data; + ret = i; + break; + } + + return ret; +} + +/* + * 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 + * @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 + */ +inline int +io_arrayPop(array_t * __restrict arr, void ** __restrict data, int delAfter) +{ + register int i; + int ret = -1; + + assert(arr); + + for (i = arr->arr_num - 1; i >= 0; i--) + if (arr->arr_data[i]) { + if (data) + *data = arr->arr_data[i]; + if (delAfter) + arr->arr_data[i] = NULL; + ret = i; + break; + } + + return ret; +} + +/* + * 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) +{ + int n; + + assert(dest); + assert(src); + if (!dest || !src) + return -1; + + n = dest->arr_num; + if (io_arrayGrow(dest, n + src->arr_num)) + return -1; + memcpy(dest->arr_data + n, src->arr_data, src->arr_num * sizeof(void*)); + + return io_arraySize(dest); } /*