--- libaitio/inc/aitio.h 2011/05/03 14:37:54 1.8.2.4 +++ libaitio/inc/aitio.h 2011/05/03 15:33:54 1.8.2.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.8.2.4 2011/05/03 14:37:54 misho Exp $ +* $Id: aitio.h,v 1.8.2.7 2011/05/03 15:33:54 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -260,6 +260,10 @@ 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) do { \ + assert(_arr && _arr->arr_num > _d); \ + *(_arr->arr_data + _d) = NULL; \ + } while (0) /* * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position @@ -343,15 +347,23 @@ inline int io_sarrVacuum(sarr_t * __restrict arr); * @idx = Index (warning 1st element is at position 1) * return: NULL not found, !=NULL element */ -inline void *io_sarrGet(sarr_t * __restrict arr, u_int idx); +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, u_int idx); +/* * io_sarrSet() - Set element to dynamic split-order array * @arr = Array * @idx = Index (warning 1st element is at position 1) * @data = Value * return: NULL error or empty, !=NULL old value in element */ -inline void *io_sarrSet(sarr_t * __restrict arr, u_int idx, void *data); +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)