29 |
|
|
30 |
|
#include "vector.h" |
31 |
|
|
32 |
< |
int statgrab_vector_resize(void **vector, vector_header *h, int count) { |
32 |
> |
int statgrab_vector_resize(char **vector, vector_header *h, int count) { |
33 |
|
int new_count, i; |
34 |
|
|
35 |
|
/* Destroy any now-unused items. */ |
36 |
|
if (count < h->used_count && h->destroy_fn != NULL) { |
37 |
|
for (i = count; i < h->used_count; i++) { |
38 |
< |
h->destroy_fn((*vector) + i * h->item_size); |
38 |
> |
h->destroy_fn((void *) ((*vector) + i * h->item_size)); |
39 |
|
} |
40 |
|
} |
41 |
|
|
45 |
|
|
46 |
|
/* Resize the vector if necessary. */ |
47 |
|
if (new_count != h->alloc_count) { |
48 |
< |
void *new_vector; |
48 |
> |
char *new_vector; |
49 |
|
|
50 |
|
new_vector = realloc(*vector, new_count * h->item_size); |
51 |
|
if (new_vector == NULL && new_count != 0) { |
61 |
|
/* Initialise any new items. */ |
62 |
|
if (count > h->used_count && h->init_fn != NULL) { |
63 |
|
for (i = h->used_count; i < count; i++) { |
64 |
< |
h->init_fn((*vector) + i * h->item_size); |
64 |
> |
h->init_fn((void *) ((*vector) + i * h->item_size)); |
65 |
|
} |
66 |
|
} |
67 |
|
|