Mercurial > code
annotate array.c @ 29:19c0d2e11406
Security fixes for array
author | David Demelier <markand@malikania.fr> |
---|---|
date | Thu, 22 Sep 2011 21:07:51 +0200 |
parents | 904a373aa120 |
children | e2c3a0a549d2 |
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 |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
25 #define SIZE(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 * |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
30 array_new(const void *data, size_t unit, size_t bsize, int flags) |
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 |
22
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
37 arr->tmp = NULL; |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
38 arr->length = 0; |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
39 arr->flags = flags; |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
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; |
22
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
42 arr->size = SIZE(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 |
25
e09000fc013a
Switch to void * thus the user do not need to cast
David Demelier <markand@malikania.fr>
parents:
23
diff
changeset
|
67 memmove((char *) arr->data + arr->unit, arr->data, SIZE(arr->length++)); |
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 |
26 | 84 memmove((char *) arr->data + SIZE(index + 1), |
85 (char *) arr->data + SIZE(index), SIZE(arr->length++ - index)); | |
25
e09000fc013a
Switch to void * thus the user do not need to cast
David Demelier <markand@malikania.fr>
parents:
23
diff
changeset
|
86 memcpy((char *) arr->data + SIZE(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 |
25
e09000fc013a
Switch to void * thus the user do not need to cast
David Demelier <markand@malikania.fr>
parents:
23
diff
changeset
|
101 memcpy((char *) arr->data + SIZE(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) { |
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
114 memmove((char *) arr->data, (char *) arr->data + SIZE(1), |
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
115 SIZE(--arr->length)); |
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
116 memset((char *) arr->data + SIZE(arr->length), 0, arr->unit); |
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) |
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
128 memset((char *) arr->data + SIZE(--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) { |
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
139 memmove((char *) arr->data + SIZE(index), |
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
140 (char *) arr->data + SIZE(index + 1), |
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
141 SIZE(arr->length - index - 1)); |
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
142 memset((char *) arr->data + SIZE(--arr->length), 0, arr->unit); |
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 /* |
22
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
147 * 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
|
148 * 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
|
149 * 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
|
150 */ |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
151 |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
152 int |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
153 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
|
154 { |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
155 /* Out of bounds */ |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
156 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
|
157 return -1; |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
158 |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
159 /* |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
160 * 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
|
161 * function. |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
162 */ |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
163 |
28
904a373aa120
Buffer security fix. Also switched to == NULL statement instead of ! as
David Demelier <markand@malikania.fr>
parents:
26
diff
changeset
|
164 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
|
165 return -1; |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
166 |
25
e09000fc013a
Switch to void * thus the user do not need to cast
David Demelier <markand@malikania.fr>
parents:
23
diff
changeset
|
167 memcpy((char *) arr->tmp, (char *) arr->data + SIZE(i1), arr->unit); |
26 | 168 memcpy((char *) arr->data + SIZE(i1), (char *) arr->data + SIZE(i2), |
169 arr->unit); | |
25
e09000fc013a
Switch to void * thus the user do not need to cast
David Demelier <markand@malikania.fr>
parents:
23
diff
changeset
|
170 memcpy((char *) arr->data + SIZE(i2), (char *) arr->tmp, arr->unit); |
22
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
171 |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
172 return 0; |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
173 } |
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 /* |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
176 * 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
|
177 * argument to the function too. |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
178 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
179 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
180 void |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
181 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
|
182 { |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
183 int i; |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
184 |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
185 for (i = 0; i < arr->length; ++i) |
25
e09000fc013a
Switch to void * thus the user do not need to cast
David Demelier <markand@malikania.fr>
parents:
23
diff
changeset
|
186 fn((char *) arr->data + SIZE(i), udata); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
187 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
188 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
189 /* |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
190 * 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
|
191 * 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
|
192 * 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
|
193 * NULL. |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
194 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
195 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
196 void * |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
197 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
|
198 { |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
199 int st, i; |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
200 void *data; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
201 |
28
904a373aa120
Buffer security fix. Also switched to == NULL statement instead of ! as
David Demelier <markand@malikania.fr>
parents:
26
diff
changeset
|
202 for (i = st = 0; i < arr->length && st != 1; ++i) |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
203 st = fn((char *) arr->data + SIZE(i), u); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
204 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
205 if (st) { |
25
e09000fc013a
Switch to void * thus the user do not need to cast
David Demelier <markand@malikania.fr>
parents:
23
diff
changeset
|
206 data = (char *) arr->data + SIZE(--i); |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
207 if (ix) |
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
208 *ix = i; |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
209 } else |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
210 data = NULL; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
211 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
212 return data; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
213 } |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
214 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
215 /* |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
216 * 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
|
217 * 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
|
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 void |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
221 array_clear(struct array *arr) |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
222 { |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
223 memset(arr->data, 0, arr->size); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
224 arr->length = 0; |
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 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
227 /* |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
228 * 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
|
229 */ |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
230 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
231 void |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
232 array_free(struct array *arr) |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
233 { |
8
127254037b30
Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents:
7
diff
changeset
|
234 array_clear(arr); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
235 |
22
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
236 if (arr->data) |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
237 free(arr->data); |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
238 if (arr->tmp) |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
239 free(arr->tmp); |
ecdf21f1d0c6
Added a new function array_swap() that swap elements by index
David Demelier <markand@malikania.fr>
parents:
17
diff
changeset
|
240 |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
241 free(arr); |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
242 } |
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 * 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
|
246 * 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
|
247 * succeeded. |
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 static int |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
251 array_grow(struct array *arr) |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
252 { |
17
e9a7b671d707
Use char * instead of void, MSVC does not like void * arithmetic
David Demelier <markand@malikania.fr>
parents:
14
diff
changeset
|
253 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
|
254 return 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 if (arr->flags & ARRAY_AUTO) { |
28
904a373aa120
Buffer security fix. Also switched to == NULL statement instead of ! as
David Demelier <markand@malikania.fr>
parents:
26
diff
changeset
|
257 if ((arr->data = realloc(arr->data, arr->size + |
904a373aa120
Buffer security fix. Also switched to == NULL statement instead of ! as
David Demelier <markand@malikania.fr>
parents:
26
diff
changeset
|
258 SIZE(arr->bsize))) == NULL) |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
259 return -1; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
260 |
10 | 261 arr->size += SIZE(arr->bsize); |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
262 } else |
29
19c0d2e11406
Security fixes for array
David Demelier <markand@malikania.fr>
parents:
28
diff
changeset
|
263 return -1; |
6
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
264 |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
265 return 0; |
25cc379de564
Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff
changeset
|
266 } |