|
7 | 7 |
|
8 | 8 | #include "cvector.h" |
9 | 9 |
|
10 | | -int vector_reserve_impl(void **v, const size_t n, |
11 | | - const size_t item_size) |
| 10 | +int vector_reserve_impl(void **v, const size_t n, const size_t item_size) |
12 | 11 | { |
13 | | - vector_header_t *header; |
14 | | - vector_header_t *new_header; |
| 12 | + vector_header_t *header; |
| 13 | + vector_header_t *new_header; |
15 | 14 |
|
16 | | - if (!v || n == 0 || item_size == 0) |
17 | | - return VECTOR_FAILURE; |
18 | | - if (!*v) { |
19 | | - *v = vector_init(item_size, n); |
20 | | - return *v ? VECTOR_SUCCESS : VECTOR_FAILURE; |
21 | | - } |
22 | | - header = VECTOR_HEADER(*v); |
23 | | - if (n <= header->capacity) |
| 15 | + if (!v || n == 0 || item_size == 0) |
| 16 | + return VECTOR_FAILURE; |
| 17 | + if (!*v) { |
| 18 | + *v = vector_init(item_size, n); |
| 19 | + return *v ? VECTOR_SUCCESS : VECTOR_FAILURE; |
| 20 | + } |
| 21 | + header = VECTOR_HEADER(*v); |
| 22 | + if (n <= header->capacity) |
| 23 | + return VECTOR_SUCCESS; |
| 24 | + new_header = realloc(header, sizeof(vector_header_t) + (n * item_size)); |
| 25 | + #warning "TODO: memset new memory" |
| 26 | + if (!new_header) |
| 27 | + return VECTOR_FAILURE; |
| 28 | + new_header->capacity = n; |
| 29 | + *v = (new_header + 1); |
24 | 30 | return VECTOR_SUCCESS; |
25 | | - new_header = realloc(header, sizeof(vector_header_t) + (n * item_size)); |
26 | | - #warning "TODO: memset new memory" |
27 | | - if (!new_header) |
28 | | - return VECTOR_FAILURE; |
29 | | - new_header->capacity = n; |
30 | | - *v = (new_header + 1); |
31 | | - |
32 | | - return VECTOR_SUCCESS; |
33 | 31 | } |
34 | 32 |
|
35 | 33 | static inline void *vector_init_zeroed(size_t item_size, size_t capacity) |
36 | 34 | { |
37 | | - vector_header_t *header; |
| 35 | + vector_header_t *header; |
38 | 36 |
|
39 | | - if (item_size == 0 || capacity == 0) |
40 | | - return NULL; |
41 | | - header = calloc(1, sizeof(vector_header_t) + item_size * capacity); |
42 | | - if (!header) |
43 | | - return NULL; |
44 | | - header->size = capacity; |
45 | | - header->capacity = capacity; |
46 | | - header->initial_capacity = capacity; |
| 37 | + if (item_size == 0 || capacity == 0) |
| 38 | + return NULL; |
| 39 | + header = calloc(1, sizeof(vector_header_t) + item_size * capacity); |
| 40 | + if (!header) |
| 41 | + return NULL; |
| 42 | + header->size = capacity; |
| 43 | + header->capacity = capacity; |
| 44 | + header->initial_capacity = capacity; |
47 | 45 |
|
48 | | - return (header + 1); |
| 46 | + return (header + 1); |
49 | 47 | } |
50 | 48 |
|
51 | 49 | int vector_resize_impl(void **v, const size_t new_size, |
52 | | - const size_t item_size) |
| 50 | + const size_t item_size) |
53 | 51 | { |
54 | | - vector_header_t *header; |
55 | | - void *tmp; |
56 | | - size_t old_size; |
| 52 | + vector_header_t *header; |
| 53 | + void *tmp; |
| 54 | + size_t old_size; |
57 | 55 |
|
58 | | - if (!v || item_size == 0) |
59 | | - return VECTOR_FAILURE; |
60 | | - if (!*v) { |
61 | | - *v = vector_init_zeroed(item_size, new_size); |
62 | | - return (*v) ? VECTOR_SUCCESS : VECTOR_FAILURE; |
63 | | - } |
64 | | - header = VECTOR_HEADER(*v); |
65 | | - old_size = header->size; |
66 | | - if (new_size < old_size) { |
| 56 | + if (!v || item_size == 0) |
| 57 | + return VECTOR_FAILURE; |
| 58 | + if (!*v) { |
| 59 | + *v = vector_init_zeroed(item_size, new_size); |
| 60 | + return (*v) ? VECTOR_SUCCESS : VECTOR_FAILURE; |
| 61 | + } |
| 62 | + header = VECTOR_HEADER(*v); |
| 63 | + old_size = header->size; |
| 64 | + if (new_size < old_size) { |
| 65 | + header->size = new_size; |
| 66 | + return VECTOR_SUCCESS; |
| 67 | + } |
| 68 | + if (new_size == old_size) |
| 69 | + return VECTOR_SUCCESS; |
| 70 | + tmp = vector_ensure_capacity(*v, new_size - old_size, item_size); |
| 71 | + if (!tmp) |
| 72 | + return VECTOR_FAILURE; |
| 73 | + *v = tmp; |
| 74 | + header = VECTOR_HEADER(*v); |
| 75 | + memset((unsigned char *)(*v) + (old_size * item_size), 0, (new_size - old_size) * item_size); |
67 | 76 | header->size = new_size; |
68 | 77 | return VECTOR_SUCCESS; |
69 | | - } |
70 | | - if (new_size == old_size) |
71 | | - return VECTOR_SUCCESS; |
72 | | - tmp = vector_ensure_capacity(*v, new_size - old_size, item_size); |
73 | | - if (!tmp) |
74 | | - return VECTOR_FAILURE; |
75 | | - *v = tmp; |
76 | | - header = VECTOR_HEADER(*v); |
77 | | - memset((unsigned char *)(*v) + (old_size * item_size), 0, (new_size - old_size) * item_size); |
78 | | - header->size = new_size; |
79 | | - |
80 | | - return VECTOR_SUCCESS; |
81 | 78 | } |
82 | 79 |
|
83 | 80 | int vector_shrink_to_fit_impl(void **v, const size_t item_size) |
84 | 81 | { |
85 | | - vector_header_t *header; |
86 | | - vector_header_t *new_header; |
| 82 | + vector_header_t *header; |
| 83 | + vector_header_t *new_header; |
87 | 84 |
|
88 | | - if (!v || !*v || item_size == 0) |
89 | | - return VECTOR_FAILURE; |
90 | | - |
91 | | - header = VECTOR_HEADER(*v); |
92 | | - if (header->capacity == header->size) |
| 85 | + if (!v || !*v || item_size == 0) |
| 86 | + return VECTOR_FAILURE; |
| 87 | + header = VECTOR_HEADER(*v); |
| 88 | + if (header->capacity == header->size) |
| 89 | + return VECTOR_SUCCESS; |
| 90 | + new_header = realloc(header, sizeof(vector_header_t) + (header->size * item_size)); |
| 91 | + if (!new_header) |
| 92 | + return VECTOR_FAILURE; |
| 93 | + new_header->capacity = new_header->size; |
| 94 | + *v = (new_header + 1); |
93 | 95 | return VECTOR_SUCCESS; |
94 | | - |
95 | | - new_header = realloc(header, sizeof(vector_header_t) + (header->size * item_size)); |
96 | | - if (!new_header) |
97 | | - return VECTOR_FAILURE; |
98 | | - |
99 | | - new_header->capacity = new_header->size; |
100 | | - *v = (new_header + 1); |
101 | | - return VECTOR_SUCCESS; |
102 | 96 | } |
0 commit comments