1 |
|
/* |
2 |
< |
* i-scream central monitoring system |
2 |
> |
* i-scream libstatgrab |
3 |
|
* http://www.i-scream.org |
4 |
|
* Copyright (C) 2000-2004 i-scream |
5 |
|
* |
27 |
|
|
28 |
|
#include <stdlib.h> |
29 |
|
|
30 |
+ |
#include "tools.h" |
31 |
|
#include "vector.h" |
32 |
|
|
33 |
< |
int statgrab_vector_resize(void **vector, vector_header *h, int count) { |
33 |
> |
void *sg_vector_resize(void *vector, vector_header *h, int count) { |
34 |
|
int new_count, i; |
35 |
|
|
36 |
< |
/* Destroy any now-unused items. */ |
36 |
> |
/* Destroy any now-unused items. |
37 |
> |
* |
38 |
> |
* Note that there's an assumption here that making the vector smaller |
39 |
> |
* will never fail; if it did, then we would have destroyed items here |
40 |
> |
* but not actually got rid of the vector pointing to them before the |
41 |
> |
* error return.) */ |
42 |
|
if (count < h->used_count && h->destroy_fn != NULL) { |
43 |
|
for (i = count; i < h->used_count; i++) { |
44 |
< |
h->destroy_fn((*vector) + i * h->item_size); |
44 |
> |
h->destroy_fn((void *) (vector + i * h->item_size)); |
45 |
|
} |
46 |
|
} |
47 |
|
|
48 |
|
/* Round up the desired size to the next multiple of the block size. */ |
49 |
|
new_count = ((count - 1 + h->block_size) / h->block_size) |
50 |
< |
* h->block_size; |
50 |
> |
* h->block_size; |
51 |
|
|
52 |
|
/* Resize the vector if necessary. */ |
53 |
|
if (new_count != h->alloc_count) { |
54 |
< |
void *new_vector; |
54 |
> |
char *new_vector; |
55 |
|
|
56 |
< |
new_vector = realloc(*vector, new_count * h->item_size); |
56 |
> |
new_vector = sg_realloc(vector, new_count * h->item_size); |
57 |
|
if (new_vector == NULL && new_count != 0) { |
58 |
|
/* Out of memory -- free the contents of the vector. */ |
59 |
< |
statgrab_vector_resize(vector, h, 0); |
60 |
< |
return -1; |
59 |
> |
sg_vector_resize(vector, h, 0); |
60 |
> |
h->error = -1; |
61 |
> |
return vector; |
62 |
|
} |
63 |
|
|
64 |
< |
*vector = new_vector; |
64 |
> |
vector = new_vector; |
65 |
|
h->alloc_count = new_count; |
66 |
|
} |
67 |
|
|
68 |
|
/* Initialise any new items. */ |
69 |
|
if (count > h->used_count && h->init_fn != NULL) { |
70 |
|
for (i = h->used_count; i < count; i++) { |
71 |
< |
h->init_fn((*vector) + i * h->item_size); |
71 |
> |
h->init_fn((void *) (vector + i * h->item_size)); |
72 |
|
} |
73 |
|
} |
74 |
|
|
75 |
|
h->used_count = count; |
76 |
< |
|
77 |
< |
return 0; |
76 |
> |
h->error = 0; |
77 |
> |
return vector; |
78 |
|
} |
79 |
|
|