Mercurial > code
annotate array.c @ 34:653bb22d3c0c
For array.c:
o No index needed in ARRAY_FOREACH or ARRAY_FOREACH_R, it is stored in
the structure.
o Added a function to remove by data : array_unref()
author | David Demelier <markand@malikania.fr> |
---|---|
date | Fri, 30 Sep 2011 16:38:40 +0200 |
parents | e532a973f43d |
children | b972758ddcd5 |
rev | line source |
---|---|
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
1 /* |
14 | 2 * array.c -- manipulate dynamic arrays |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
3 * |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
4 * Copyright (c) 2011, David Demelier <markand@malikania.fr> |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
5 * |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
6 * Permission to use, copy, modify, and/or distribute this software for any |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
7 * purpose with or without fee is hereby granted, provided that the above |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
8 * copyright notice and this permission notice appear in all copies. |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
9 * |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
9 | 14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
17 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
18 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
19 #include <stdio.h> |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
20 #include <stdlib.h> |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
21 #include <string.h> |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
22 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
23 #include "array.h" |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
24 |
30 | 25 #define OFFSET(x) (arr->unit * (x)) |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
26 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
27 static int array_grow(struct array *); |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
28 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
29 struct array * |
34 | 30 array_new(const void *data, size_t unit, int bsize, int type) |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
31 { |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
32 struct array *arr; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
33 |
28
904a373aa120
Buffer security fix. Also switched to == NULL statement instead of ! as
David Demelier <markand@malikania.fr>
parents:
26
diff
changeset
|
34 if (unit == 0 || (arr = malloc(sizeof (struct array))) == NULL) |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
35 return NULL; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
36 |
34 | 37 memset(arr, 0, sizeof (struct array)); |
38 | |
39 arr->type = type; | |
31 | 40 arr->bsize = (bsize == 0) ? ARRAY_DEFAULT_BSIZE : bsize; |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
41 arr->unit = unit; |
30 | 42 arr->size = OFFSET(arr->bsize); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
43 |
28
904a373aa120
Buffer security fix. Also switched to == NULL statement instead of ! as
David Demelier <markand@malikania.fr>
parents:
26
diff
changeset
|
44 if ((arr->data = malloc(arr->size)) == NULL) { |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
45 free(arr); |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
46 return NULL; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
47 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
48 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
49 if (data) |
12
cbfe95c9f7b7
Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents:
10
diff
changeset
|
50 memcpy(arr->data, data, arr->unit); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
51 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
52 return arr; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
53 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
54 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
55 /* |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
56 * Add to the head of array. NOTE: this may be very slow when adding a lot |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
57 * of object (about 100000). If you need to add a lot of data please consider |
26 | 58 * using linked list instead. |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
59 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
60 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
61 int |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
62 array_push(struct array *arr, const void *data) |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
63 { |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
64 if (array_grow(arr) < 0) |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
65 return -1; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
66 |
30 | 67 memmove((char *) arr->data + arr->unit, arr->data, OFFSET(arr->length++)); |
25
e09000fc013a
Switch to void * thus the user do not need to cast
David Demelier <markand@malikania.fr>
parents:
23
diff
changeset
|
68 memcpy((char *) arr->data, data, arr->unit); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
69 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
70 return 0; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
71 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
72 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
73 /* |
26 | 74 * Insert the data at the specified index. The function returns -1 on |
75 * allocation failure or when the index is outof bounds otherwise 0 is returned. | |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
76 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
77 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
78 int |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
79 array_insert(struct array *arr, const void *data, int index) |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
80 { |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
81 if (index > arr->length - 1 || index < 0 || array_grow(arr) < 0) |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
82 return -1; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
83 |
30 | 84 memmove((char *) arr->data + OFFSET(index + 1), |
85 (char *) arr->data + OFFSET(index), OFFSET(arr->length++ - index)); | |
86 memcpy((char *) arr->data + OFFSET(index), data, arr->unit); | |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
87 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
88 return 0; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
89 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
90 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
91 /* |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
92 * Append the data to the end of array. |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
93 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
94 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
95 int |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
96 array_append(struct array *arr, const void *data) |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
97 { |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
98 if (array_grow(arr) < 0) |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
99 return -1; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
100 |
30 | 101 memcpy((char *) arr->data + OFFSET(arr->length++), data, arr->unit); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
102 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
103 return 0; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
104 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
105 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
106 /* |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
107 * Remove the array's head. |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
108 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
109 |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
110 void |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
111 array_pop(struct array *arr) |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
112 { |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
113 if (arr->length > 0) { |
30 | 114 memmove((char *) arr->data, (char *) arr->data + OFFSET(1), |
115 OFFSET(--arr->length)); | |
116 memset((char *) arr->data + OFFSET(arr->length), 0, arr->unit); | |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
117 } |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
118 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
119 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
120 /* |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
121 * Remove the array's tail. |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
122 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
123 |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
124 void |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
125 array_unqueue(struct array *arr) |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
126 { |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
127 if (arr->length > 0) |
30 | 128 memset((char *) arr->data + OFFSET(--arr->length), 0, arr->unit); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
129 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
130 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
131 /* |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
132 * Remove the data at the specified index. Bounds are checked. |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
133 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
134 |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
135 void |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
136 array_remove(struct array *arr, int index) |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
137 { |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
138 if (arr->length > 0 && index >= 0 && index < arr->length) { |
30 | 139 memmove((char *) arr->data + OFFSET(index), |
140 (char *) arr->data + OFFSET(index + 1), | |
141 OFFSET(arr->length - index - 1)); | |
142 memset((char *) arr->data + OFFSET(--arr->length), 0, arr->unit); | |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
143 } |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
144 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
145 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
146 /* |
34 | 147 * Remove the object referenced by the `data' argument. Useful when you |
148 * don't know the index. | |
149 */ | |
150 | |
151 struct personne { | |
152 char *name; | |
153 int age; | |
154 }; | |
155 | |
156 void | |
157 array_unref(struct array *arr, const void *data) | |
158 { | |
159 void *elm; | |
160 int i; | |
161 | |
162 for (i = 0; i < arr->length; ++i) { | |
163 elm = ARRAY_INDEX(arr, i); | |
164 | |
165 if (memcmp(elm, data, arr->unit) == 0) | |
166 array_remove(arr, i); | |
167 } | |
168 } | |
169 | |
170 /* | |
22
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
171 * Swap the two elements referenced by index `i1' and `i2'. This function needs |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
172 * to allocate data to swap elements thus if the functions fails it returns -1 |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
173 * otherwise 0 is returned. |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
174 */ |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
175 |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
176 int |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
177 array_swap(struct array *arr, int i1, int i2) |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
178 { |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
179 /* Out of bounds */ |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
180 if (i1 >= arr->length || i1 < 0 || i2 >= arr->length || i2 < 0) |
22
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
181 return -1; |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
182 |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
183 /* |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
184 * Only allocate at this time, the user may do not want to use this |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
185 * function. |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
186 */ |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
187 |
34 | 188 if (arr->_tmp == NULL && (arr->_tmp = malloc(arr->unit)) == NULL) |
22
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
189 return -1; |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
190 |
34 | 191 memcpy((char *) arr->_tmp, (char *) arr->data + OFFSET(i1), arr->unit); |
30 | 192 memcpy((char *) arr->data + OFFSET(i1), (char *) arr->data + OFFSET(i2), |
26 | 193 arr->unit); |
34 | 194 memcpy((char *) arr->data + OFFSET(i2), (char *) arr->_tmp, arr->unit); |
195 | |
196 /* | |
197 * Clear bytes for safety. | |
198 */ | |
199 | |
200 memset(arr->_tmp, 0, arr->unit); | |
22
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
201 |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
202 return 0; |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
203 } |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
204 |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
205 /* |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
206 * Apply the function `fn' on each object and give the optional `udata' |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
207 * argument to the function too. |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
208 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
209 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
210 void |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
211 array_map(const struct array *arr, void (*fn)(void *, void *), void *udata) |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
212 { |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
213 int i; |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
214 |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
215 for (i = 0; i < arr->length; ++i) |
30 | 216 fn((char *) arr->data + OFFSET(i), udata); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
217 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
218 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
219 /* |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
220 * Compare each object with the user supplied function. If the `fn' function |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
221 * returns 1 then the data is returned. Optional idx argument can be set to |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
222 * indicate the data position. If the data was not found the function returns |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
223 * NULL. |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
224 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
225 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
226 void * |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
227 array_find(const struct array *arr, int (*fn)(void *, void *), int *ix, void *u) |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
228 { |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
229 int st, i; |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
230 void *data; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
231 |
28
904a373aa120
Buffer security fix. Also switched to == NULL statement instead of ! as
David Demelier <markand@malikania.fr>
parents:
26
diff
changeset
|
232 for (i = st = 0; i < arr->length && st != 1; ++i) |
30 | 233 st = fn((char *) arr->data + OFFSET(i), u); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
234 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
235 if (st) { |
30 | 236 data = (char *) arr->data + OFFSET(--i); |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
237 if (ix) |
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
238 *ix = i; |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
239 } else |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
240 data = NULL; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
241 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
242 return data; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
243 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
244 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
245 /* |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
246 * Reset the array, if the trash argument is set it will free the object |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
247 * too, otherwise the array is just truncated to 0 length. |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
248 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
249 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
250 void |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
251 array_clear(struct array *arr) |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
252 { |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
253 memset(arr->data, 0, arr->size); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
254 arr->length = 0; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
255 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
256 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
257 /* |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
258 * Same as array_clear except it also free the array object. |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
259 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
260 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
261 void |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
262 array_free(struct array *arr) |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
263 { |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
264 array_clear(arr); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
265 |
22
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
266 if (arr->data) |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
267 free(arr->data); |
34 | 268 if (arr->_tmp) |
269 free(arr->_tmp); | |
22
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
270 |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
271 free(arr); |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
272 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
273 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
274 /* |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
275 * Increate the array storage when it is full. If the buffer is fixed size |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
276 * it returns -1 on full buffer otherwise 0 is returned if allocation |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
277 * succeeded. |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
278 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
279 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
280 static int |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
281 array_grow(struct array *arr) |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
282 { |
17
e9a7b671d707
Use char * instead of void, MSVC does not like void * arithmetic
David Demelier <markand@malikania.fr>
parents:
14
diff
changeset
|
283 if ((arr->size / arr->unit) > (size_t) arr->length) |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
284 return 0; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
285 |
34 | 286 if (arr->type == ARRAY_AUTO) { |
28
904a373aa120
Buffer security fix. Also switched to == NULL statement instead of ! as
David Demelier <markand@malikania.fr>
parents:
26
diff
changeset
|
287 if ((arr->data = realloc(arr->data, arr->size + |
30 | 288 OFFSET(arr->bsize))) == NULL) |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
289 return -1; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
290 |
30 | 291 arr->size += OFFSET(arr->bsize); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
292 } else |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
293 return -1; |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
294 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
295 return 0; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
296 } |