Mercurial > code
annotate array.c @ 142:e3cf5ac9a5aa
[p]array_insert now returns -1 or index of added element
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Tue, 08 May 2012 15:02:17 +0200 |
| parents | c6d9eb5702e8 |
| children | 535f12e0a5af |
| rev | line source |
|---|---|
| 62 | 1 /* |
| 2 * array.c -- manipulate dynamic arrays | |
| 3 * | |
| 98 | 4 * Copyright (c) 2011, 2012, David Demelier <markand@malikania.fr> |
| 62 | 5 * |
| 6 * Permission to use, copy, modify, and/or distribute this software for any | |
| 7 * purpose with or without fee is hereby granted, provided that the above | |
| 8 * copyright notice and this permission notice appear in all copies. | |
| 9 * | |
| 10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | |
| 11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | |
| 12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | |
| 13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | |
| 14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | |
| 15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | |
| 16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | |
| 17 */ | |
| 18 | |
| 19 #include <stdio.h> | |
| 20 #include <stdlib.h> | |
| 21 #include <string.h> | |
| 22 | |
| 23 #include "array.h" | |
| 24 | |
| 25 #define OFFSET(x) (arr->unit * (x)) | |
| 26 | |
|
124
5917096facb9
Use enum and add #ifdef __cplusplus
David Demelier <markand@malikania.fr>
parents:
123
diff
changeset
|
27 static int grow(struct array *); |
| 62 | 28 |
|
91
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
29 int |
|
93
9ebea85c7765
Use pointer instead of copying variable in ARRAY_FOREACH, then you can modify it
David Demelier <markand@malikania.fr>
parents:
92
diff
changeset
|
30 array_init(struct array *arr, size_t unit) |
| 62 | 31 { |
|
91
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
32 if (unit == 0) |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
33 return -1; |
| 62 | 34 |
| 35 arr->unit = unit; | |
| 36 arr->size = OFFSET(arr->bsize); | |
| 37 | |
| 92 | 38 /* Set defaults if needed */ |
| 39 arr->bsize = (arr->bsize <= 0) ? ARRAY_DEFAULT_BSIZE : arr->bsize; | |
|
91
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
40 arr->malloc = (arr->malloc == NULL) ? &malloc : arr->malloc; |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
41 arr->realloc = (arr->realloc == NULL) ? &realloc : arr->realloc; |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
42 |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
43 if ((arr->data = arr->malloc(arr->size)) == NULL) |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
44 return -1; |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
45 |
| 136 | 46 if (arr->flags & ARRAY_CLEARBITS) |
| 47 memset(arr->data, 0, arr->size); | |
| 48 | |
|
91
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
49 return 0; |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
50 } |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
51 |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
52 /* |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
53 * Valid options that can be set for an array : |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
54 * l -> optional array block size of type int |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
55 * m -> malloc function that must matches void * (*malloc)(size_t) |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
56 * r -> realloc function that must matches void * (*realloc)(void *, size_t) |
| 136 | 57 * f -> array flags of type int |
|
91
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
58 */ |
| 62 | 59 |
|
91
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
60 void |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
61 array_set(struct array *arr, const char *fmt, ...) |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
62 { |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
63 va_list ap; |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
64 const char *p; |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
65 |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
66 va_start(ap, fmt); |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
67 for (p = fmt; *p != '\0'; ++p) |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
68 switch (*p) { |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
69 case 'l': |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
70 arr->bsize = va_arg(ap, int); |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
71 break; |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
72 case 'm': |
|
93
9ebea85c7765
Use pointer instead of copying variable in ARRAY_FOREACH, then you can modify it
David Demelier <markand@malikania.fr>
parents:
92
diff
changeset
|
73 arr->malloc = va_arg(ap, void *(*)(size_t)); |
|
91
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
74 break; |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
75 case 'r': |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
76 arr->realloc = va_arg(ap, void *(*)(void *, size_t)); |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
77 break; |
| 136 | 78 case 'f': |
| 79 arr->flags = va_arg(ap, int); | |
|
99
d534fdcbb319
Remove #ifdef __cplusplus
David Demelier <markand@malikania.fr>
parents:
98
diff
changeset
|
80 break; |
|
91
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
81 default: |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
82 break; |
|
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
83 } |
| 62 | 84 } |
| 85 | |
| 86 /* | |
| 87 * Add to the head of array. NOTE: this may be very slow when adding a lot | |
| 88 * of object (about 100000). If you need to add a lot of data please consider | |
|
142
e3cf5ac9a5aa
[p]array_insert now returns -1 or index of added element
David Demelier <markand@malikania.fr>
parents:
136
diff
changeset
|
89 * using linked list instead. Returns -1 on failure or 0 on success. |
| 62 | 90 */ |
| 91 | |
| 92 int | |
| 93 array_push(struct array *arr, const void *data) | |
| 94 { | |
|
124
5917096facb9
Use enum and add #ifdef __cplusplus
David Demelier <markand@malikania.fr>
parents:
123
diff
changeset
|
95 if (grow(arr) < 0) |
| 62 | 96 return -1; |
| 97 | |
|
64
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
98 memmove((char *)arr->data + arr->unit, arr->data, OFFSET(arr->length++)); |
|
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
99 memcpy((char *)arr->data, data, arr->unit); |
| 62 | 100 |
| 101 return 0; | |
| 102 } | |
| 103 | |
| 104 /* | |
| 105 * Insert the data at the specified index. The function returns -1 on | |
|
142
e3cf5ac9a5aa
[p]array_insert now returns -1 or index of added element
David Demelier <markand@malikania.fr>
parents:
136
diff
changeset
|
106 * allocation failure or the position of the added element. |
| 62 | 107 */ |
| 108 | |
| 109 int | |
| 110 array_insert(struct array *arr, const void *data, int index) | |
| 111 { | |
| 118 | 112 if (index < 0) |
| 113 return array_push(arr, data); | |
| 114 if (index >= arr->length) | |
| 115 return array_append(arr, data); | |
| 62 | 116 |
| 118 | 117 /* Good place */ |
|
64
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
118 memmove((char *)arr->data + OFFSET(index + 1), |
|
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
119 (char *)arr->data + OFFSET(index), OFFSET(arr->length++ - index)); |
|
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
120 memcpy((char *)arr->data + OFFSET(index), data, arr->unit); |
| 62 | 121 |
|
142
e3cf5ac9a5aa
[p]array_insert now returns -1 or index of added element
David Demelier <markand@malikania.fr>
parents:
136
diff
changeset
|
122 return index; |
| 62 | 123 } |
| 124 | |
| 125 /* | |
|
142
e3cf5ac9a5aa
[p]array_insert now returns -1 or index of added element
David Demelier <markand@malikania.fr>
parents:
136
diff
changeset
|
126 * Append the data to the end of array. Returns -1 on failure or the position |
|
e3cf5ac9a5aa
[p]array_insert now returns -1 or index of added element
David Demelier <markand@malikania.fr>
parents:
136
diff
changeset
|
127 * of the added element. |
| 62 | 128 */ |
| 129 | |
| 130 int | |
| 131 array_append(struct array *arr, const void *data) | |
| 132 { | |
|
124
5917096facb9
Use enum and add #ifdef __cplusplus
David Demelier <markand@malikania.fr>
parents:
123
diff
changeset
|
133 if (grow(arr) < 0) |
| 62 | 134 return -1; |
| 135 | |
|
64
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
136 memcpy((char *)arr->data + OFFSET(arr->length++), data, arr->unit); |
| 62 | 137 |
|
142
e3cf5ac9a5aa
[p]array_insert now returns -1 or index of added element
David Demelier <markand@malikania.fr>
parents:
136
diff
changeset
|
138 return (arr->length - 1); |
| 62 | 139 } |
| 140 | |
| 141 /* | |
| 142 * Remove the array's head. | |
| 143 */ | |
| 144 | |
| 145 void | |
| 146 array_pop(struct array *arr) | |
| 147 { | |
| 136 | 148 array_iremove(arr, 0); |
| 62 | 149 } |
| 150 | |
| 151 /* | |
| 152 * Remove the array's tail. | |
| 153 */ | |
| 154 | |
| 155 void | |
| 156 array_unqueue(struct array *arr) | |
| 157 { | |
| 136 | 158 array_iremove(arr, arr->length - 1); |
| 62 | 159 } |
| 160 | |
| 161 /* | |
| 162 * Remove the data at the specified index. Bounds are checked. | |
| 163 */ | |
| 164 | |
| 165 void | |
| 119 | 166 array_iremove(struct array *arr, int index) |
| 62 | 167 { |
| 168 if (arr->length > 0 && index >= 0 && index < arr->length) { | |
| 136 | 169 if (arr->flags & ARRAY_FASTREMOVE) |
| 170 memmove((char *)arr->data + OFFSET(index), | |
| 171 (char *)arr->data + OFFSET(--arr->length), | |
| 172 arr->unit); | |
| 173 else | |
| 174 memmove((char *)arr->data + OFFSET(index), | |
| 175 (char *)arr->data + OFFSET(index + 1), | |
| 176 OFFSET(arr->length-- - index - 1)); | |
| 62 | 177 } |
| 136 | 178 |
| 179 if (arr->flags & ARRAY_CLEARBITS) | |
| 180 memset((char *)arr->data + OFFSET(arr->length), 0, arr->unit); | |
| 62 | 181 } |
| 182 | |
| 183 /* | |
| 184 * Remove the object referenced by the `data' argument. Useful when you | |
| 185 * don't know the index. | |
| 186 */ | |
| 187 | |
| 188 void | |
| 119 | 189 array_premove(struct array *arr, const void *data) |
| 62 | 190 { |
| 191 void *elm; | |
| 192 int i; | |
| 193 | |
| 194 for (i = 0; i < arr->length; ++i) { | |
|
64
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
195 elm = (char *)arr->data + OFFSET(i); |
| 62 | 196 |
| 136 | 197 if (memcmp(elm, data, arr->unit) == 0) { |
| 123 | 198 array_iremove(arr, i); |
| 136 | 199 break; |
| 200 } | |
| 62 | 201 } |
| 202 } | |
| 203 | |
| 204 /* | |
| 205 * Swap the two elements referenced by index `i1' and `i2'. This function needs | |
| 206 * to allocate data to swap elements thus if the functions fails it returns -1 | |
| 207 * otherwise 0 is returned. | |
| 208 */ | |
| 209 | |
| 210 int | |
| 211 array_iswap(struct array *arr, int i1, int i2) | |
| 212 { | |
| 213 void *tmp; | |
| 214 | |
| 215 /* Out of bounds */ | |
| 216 if (i1 >= arr->length || i1 < 0 || i2 >= arr->length || i2 < 0) | |
| 217 return -1; | |
| 218 | |
|
91
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
219 if ((tmp = arr->malloc(arr->unit)) == NULL) |
| 62 | 220 return -1; |
| 221 | |
|
64
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
222 memcpy((char *)tmp, (char *)arr->data + OFFSET(i1), arr->unit); |
|
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
223 memcpy((char *)arr->data + OFFSET(i1), (char *)arr->data + OFFSET(i2), |
| 62 | 224 arr->unit); |
|
64
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
225 memcpy((char *)arr->data + OFFSET(i2), (char *)tmp, arr->unit); |
| 62 | 226 |
| 227 /* | |
| 228 * Clear bytes for safety you probably don't want a password or | |
| 229 * secure data to be left somewhere in the memory. | |
| 230 */ | |
| 231 | |
| 136 | 232 if (arr->flags & ARRAY_CLEARBITS) |
| 233 memset(tmp, 0, arr->unit); | |
| 62 | 234 free(tmp); |
| 235 | |
| 236 return 0; | |
| 237 } | |
| 238 | |
| 239 /* | |
| 240 * Swap the two elements referenced by data `o1' and `o2'. This function | |
| 241 * may be slow on large arrays since it must travel all the object | |
| 242 * to find the indexes. | |
| 243 */ | |
| 244 | |
| 245 int | |
| 246 array_pswap(struct array *arr, const void *o1, const void *o2) | |
| 247 { | |
| 248 int found, i1, i2; | |
| 249 | |
| 250 for (i1 = found = 0; !found && i1 < arr->length; ++i1) | |
|
64
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
251 found = memcmp((char *)arr->data + OFFSET(i1), o1, arr->unit) == 0; |
| 62 | 252 |
| 253 if (!found) | |
| 254 return -1; | |
| 255 | |
| 256 for (i2 = found = 0; !found && i2 < arr->length; ++i2) | |
|
64
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
257 found = memcmp((char *)arr->data + OFFSET(i2), o2, arr->unit) == 0; |
| 62 | 258 |
| 259 if (!found) | |
| 260 return -1; | |
| 261 | |
| 262 return array_iswap(arr, --i1, --i2); | |
| 263 } | |
| 264 | |
| 265 /* | |
| 266 * Apply the function `fn' on each object and give the optional `udata' | |
| 267 * argument to the function too. | |
| 268 */ | |
| 269 | |
| 270 void | |
|
142
e3cf5ac9a5aa
[p]array_insert now returns -1 or index of added element
David Demelier <markand@malikania.fr>
parents:
136
diff
changeset
|
271 array_map(const struct array *arr, array_map_t fn, void *udata) |
| 62 | 272 { |
| 273 int i; | |
| 274 | |
| 275 for (i = 0; i < arr->length; ++i) | |
|
64
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
276 fn((char *)arr->data + OFFSET(i), udata); |
| 62 | 277 } |
| 278 | |
| 279 /* | |
| 280 * Compare each object with the user supplied function. If the `fn' function | |
|
106
06c968b92090
Use pointer to pointer in array_find, better to reuse
David Demelier <markand@malikania.fr>
parents:
99
diff
changeset
|
281 * returns 1, 1 is returned and dst points to the correct object, dst should |
|
06c968b92090
Use pointer to pointer in array_find, better to reuse
David Demelier <markand@malikania.fr>
parents:
99
diff
changeset
|
282 * be a pointer to a pointer of object, like (int **) for a array of int. |
| 62 | 283 */ |
| 284 | |
|
67
cff6869fbc94
Modified [p]array_find to return the index for a better usage
David Demelier <markand@malikania.fr>
parents:
64
diff
changeset
|
285 int |
|
142
e3cf5ac9a5aa
[p]array_insert now returns -1 or index of added element
David Demelier <markand@malikania.fr>
parents:
136
diff
changeset
|
286 array_find(const struct array *arr, array_cmp_t fn, void *dst, void *u) |
| 62 | 287 { |
| 288 int st, i; | |
| 289 | |
| 120 | 290 for (i = st = 0; i < arr->length && st != 1; ++i) |
|
64
9cc5d6d0563e
Add more cast for old gcc and other cc
David Demelier <markand@malikania.fr>
parents:
62
diff
changeset
|
291 st = fn((char *)arr->data + OFFSET(i), u); |
| 62 | 292 |
| 120 | 293 if (st && dst) |
| 294 *(char **)dst = (char *)arr->data + OFFSET(i - 1); | |
| 62 | 295 |
| 120 | 296 return (st) ? i - 1 : -1; |
| 62 | 297 } |
| 298 | |
| 136 | 299 void * |
| 300 array_first(const struct array *arr) | |
| 301 { | |
| 302 return arr->data; | |
| 303 } | |
| 304 | |
| 305 void * | |
| 306 array_last(const struct array *arr) | |
| 307 { | |
| 308 if (arr->length == 0) | |
| 309 return array_first(arr); | |
| 310 | |
| 311 return (char *)arr->data + OFFSET(arr->length - 1); | |
| 312 | |
| 313 } | |
| 314 | |
| 315 void * | |
| 316 array_index(const struct array *arr, int idx) | |
| 317 { | |
| 318 if (idx < 0) | |
| 319 return array_first(arr); | |
| 320 if (idx >= arr->length) | |
| 321 return array_last(arr); | |
| 322 | |
| 323 return (char *)arr->data + OFFSET(idx); | |
| 324 } | |
| 325 | |
| 62 | 326 /* |
| 327 * Erase every bytes and set the length to 0. | |
| 328 */ | |
| 329 | |
| 330 void | |
| 331 array_clear(struct array *arr) | |
| 332 { | |
| 136 | 333 if (arr->flags & ARRAY_CLEARBITS) |
| 334 memset(arr->data, 0, arr->size); | |
| 335 | |
| 62 | 336 arr->length = 0; |
| 337 } | |
| 338 | |
| 339 /* | |
| 340 * Same as array_clear except it also free the array object. | |
| 341 */ | |
| 342 | |
| 343 void | |
| 344 array_free(struct array *arr) | |
| 345 { | |
| 136 | 346 array_clear(arr); |
|
109
4efd3873a457
Remove useless bits in _free()
David Demelier <markand@malikania.fr>
parents:
106
diff
changeset
|
347 free(arr->data); |
| 136 | 348 |
| 349 arr->data = NULL; | |
| 350 arr->size = 0; | |
| 62 | 351 } |
| 352 | |
| 353 /* | |
| 354 * Increate the array storage when it is full. If the buffer is fixed size | |
| 355 * it returns -1 on full buffer otherwise 0 is returned if allocation | |
| 356 * succeeded. | |
| 357 */ | |
| 358 | |
| 359 static int | |
|
124
5917096facb9
Use enum and add #ifdef __cplusplus
David Demelier <markand@malikania.fr>
parents:
123
diff
changeset
|
360 grow(struct array *arr) |
| 62 | 361 { |
| 136 | 362 if ((arr->size / arr->unit) > (size_t)arr->length) |
| 62 | 363 return 0; |
| 364 | |
| 136 | 365 if (!(arr->flags & ARRAY_FIXED)) { |
|
91
b3ba5f5df3b9
New style for array.c and array.h, no pointer to these object thus
David Demelier <markand@malikania.fr>
parents:
67
diff
changeset
|
366 if ((arr->data = arr->realloc(arr->data, arr->size + |
| 136 | 367 OFFSET(arr->bsize))) == NULL) { |
| 368 arr->size = arr->length = 0; | |
| 62 | 369 return -1; |
| 136 | 370 } |
| 62 | 371 |
| 372 arr->size += OFFSET(arr->bsize); | |
| 373 } else | |
| 374 return -1; | |
| 375 | |
| 376 return 0; | |
| 377 } |