--- libaitio/src/Attic/array.c 2011/04/19 22:32:16 1.1.2.3 +++ libaitio/src/Attic/array.c 2011/08/31 12:29:32 1.4.2.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.4.2.1 2011/08/31 12:29:32 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 @@ -63,19 +63,84 @@ io_arrayInit(int numItems) } arr->arr_num = numItems; - arr->arr_data = calloc(arr->arr_num, sizeof(void*)); + arr->arr_data = calloc(io_arraySize(arr), sizeof(void*)); if (!arr->arr_data) { LOGERR; free(arr); return NULL; } else - memset(arr->arr_data, 0, arr->arr_num * sizeof(void*)); + io_arrayZero(arr); return arr; } /* - * io_arrayFree() - Free all data in dynamic array + * 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) +{ + array_t *arr = NULL; + const char **a = NULL; + register int num = 0; + + assert(pargv); + if (!pargv || !*pargv || argc < 0) + return NULL; + + if (argc) + num = argc; + else + for (a = *pargv; *a; a++, num++); + + arr = malloc(sizeof(array_t)); + if (!arr) { + LOGERR; + return NULL; + } + + arr->arr_num = num; + arr->arr_data = calloc(io_arraySize(arr), sizeof(void*)); + if (!arr->arr_data) { + LOGERR; + free(arr); + return NULL; + } else + memcpy(arr->arr_data, *pargv, io_arraySize(arr) * sizeof(void*)); + + return arr; +} + +/* + * 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) +{ + char **args = NULL; + + assert(arr); + if (!arr || !io_arraySize(arr)) + return NULL; + + args = (char **) calloc(io_arraySize(arr) + 1, sizeof(char*)); + if (!args) { + LOGERR; + return NULL; + } else + memcpy(args, arr->arr_data, io_arraySize(arr) * sizeof(char*)); + args[io_arraySize(arr)] = NULL; + + return args; +} + +/* + * io_arrayFree() - Free all data in dynamic array items * (WARNING! If assign static array dont use this!!!) * @arr = Array * return: none @@ -85,11 +150,10 @@ io_arrayFree(array_t * __restrict arr) { register int i; - assert(arr); if (!arr) return; - for (i = 0; i < arr->arr_num; i++) + for (i = 0; i < io_arraySize(arr); i++) if (arr->arr_data[i]) { free(arr->arr_data[i]); arr->arr_data[i] = NULL; @@ -97,15 +161,14 @@ 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 */ inline void io_arrayDestroy(array_t ** __restrict parr) { - assert(parr); - if (!parr) + if (!parr || !*parr) return; if ((*parr)->arr_data) @@ -128,7 +191,7 @@ io_arrayLen(array_t * __restrict arr) if (!arr) return -1; - for (i = arr->arr_num; i && !arr->arr_data[i - 1]; i--); + for (i = io_arraySize(arr); i && !arr->arr_data[i - 1]; i--); return i; } @@ -137,14 +200,15 @@ io_arrayLen(array_t * __restrict arr) * io_arrayGrow() - Grow/Shrink dynamic array, Use with care when it shrink!!! * @arr = Array * @newNumItems = Number of Items + * @freeShrink = Free elements before shrink array * return: -1 error, 0 ok */ int -io_arrayGrow(array_t * __restrict arr, int newNumItems) +io_arrayGrow(array_t * __restrict arr, int newNumItems, int freeShrink) { void **data; int n = 0; -/* register int i; */ + register int i; assert(arr); if (!arr) @@ -152,23 +216,29 @@ io_arrayGrow(array_t * __restrict arr, int newNumItems if (arr->arr_num == newNumItems) return 0; - if (arr->arr_num < newNumItems) { - n = newNumItems - arr->arr_num; - } /* else + if (io_arraySize(arr) < newNumItems) { + n = newNumItems - io_arraySize(arr); + } else if (freeShrink) for (i = newNumItems; i < arr->arr_num; i++) if (arr->arr_data[i]) free(arr->arr_data[i]); - */ arr->arr_num = newNumItems; - data = realloc(arr->arr_data, arr->arr_num * sizeof(void*)); - if (!data) { - LOGERR; - return -1; - } else - arr->arr_data = data; - memset(arr->arr_data + (arr->arr_num - n), 0, n * sizeof(void*)); + if (io_arraySize(arr)) { + data = realloc(arr->arr_data, io_arraySize(arr) * sizeof(void*)); + if (!data) { + LOGERR; + return -1; + } else + arr->arr_data = data; + memset(arr->arr_data + (io_arraySize(arr) - n), 0, n * sizeof(void*)); + } else { + if (arr->arr_data) + free(arr->arr_data); + arr->arr_data = NULL; + } + return 0; } @@ -190,7 +260,7 @@ io_arrayVacuum(array_t * __restrict arr, int fromWhere else fromWhere &= 0x7; - num = arr->arr_num; + num = io_arraySize(arr); /* if (fromWhere & VACUUM_RIGHT) { for (cx = 0, i = num - 1; i && !arr->arr_data[i]; i--, cx++); @@ -199,12 +269,13 @@ io_arrayVacuum(array_t * __restrict arr, int fromWhere */ if (fromWhere & VACUUM_LEFT) { for (i = 0; i < num && !arr->arr_data[i]; i++); + if (i) { + memmove(arr->arr_data, arr->arr_data + i, (num - i) * sizeof(void*)); + memset(arr->arr_data + (num - i), 0, i * sizeof(void*)); - memmove(arr->arr_data, arr->arr_data + i, (num - i) * sizeof(void*)); - memset(arr->arr_data + (num - i), 0, i * sizeof(void*)); - - num -= i; - cx += i; + num -= i; + cx += i; + } } if (fromWhere & VACUUM_BETWEEN) { for (i = 0; i < num; i++) { @@ -222,6 +293,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 < io_arraySize(arr); 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 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 + */ +inline int +io_arrayPop(array_t * __restrict arr, void ** __restrict data, int delAfter) +{ + register int i; + int ret = -1; + + assert(arr); + + for (i = io_arraySize(arr) - 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 = io_arraySize(dest); + if (io_arrayGrow(dest, n + io_arraySize(src), 0)) + return -1; + memcpy(dest->arr_data + n, src->arr_data, io_arraySize(src) * sizeof(void*)); + + return io_arraySize(dest); } /*