|
|
| version 1.1.1.1.6.1, 2013/03/19 17:02:12 | version 1.1.1.1.6.2, 2013/03/25 10:46:41 |
|---|---|
| Line 387 array_Push(array_t * __restrict arr, void *data, int n | Line 387 array_Push(array_t * __restrict arr, void *data, int n |
| 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; |
| } | } |