annotate array.c @ 162:3e63d94b495f

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