|
version 1.1.1.1, 2013/01/17 10:05:35
|
version 1.1.1.1.6.2, 2013/03/25 10:46:41
|
|
Line 374 array_Elem(array_t * __restrict arr, int n, void *data
|
Line 374 array_Elem(array_t * __restrict arr, int n, void *data
|
| * return: -1 not found empty position, array is full!, >-1 return position of stored element into array |
* return: -1 not found empty position, array is full!, >-1 return position of stored element into array |
| */ |
*/ |
| inline int |
inline int |
| array_Push(array_t * __restrict arr, void **data, int nogrow) | array_Push(array_t * __restrict arr, void *data, int nogrow) |
| { |
{ |
| int ret = -1; |
int ret = -1; |
| |
|
|
Line 387 array_Push(array_t * __restrict arr, void **data, int
|
Line 387 array_Push(array_t * __restrict arr, void **data, int
|
| if (!nogrow && ret >= array_Size(arr) && array_Grow(arr, ret + 1, 0)) |
if (!nogrow && ret >= array_Size(arr) && array_Grow(arr, ret + 1, 0)) |
| return -1; |
return -1; |
| |
|
| ret = arr->arr_last++; | ret = ++arr->arr_last; |
| if (data) | arr->arr_data[arr->arr_last] = data; |
| arr->arr_data[arr->arr_last] = *data; | |
| |
|
| return ret; |
return ret; |
| } |
} |
|
Line 410 array_Pop(array_t * __restrict arr, void ** __restrict
|
Line 409 array_Pop(array_t * __restrict arr, void ** __restrict
|
| if (!arr) |
if (!arr) |
| return -1; |
return -1; |
| |
|
| ret = array_Last(arr); | if ((ret = array_Last(arr)) != -1) { |
| if (data) |
| if (data) | *data = arr->arr_data[arr->arr_last]; |
| *data = arr->arr_data[ret]; | if (!nodel) |
| if (!nodel) | arr->arr_data[arr->arr_last] = NULL; |
| arr->arr_data[arr->arr_last--] = NULL; | arr->arr_last--; |
| | } |
| |
|
| return ret; |
return ret; |
| } |
} |