Mercurial > code

annotate array.c @ 21:ae4128d16c92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve security and FIXED size buffer
author David Demelier <markand@malikania.fr>
date Fri, 09 Sep 2011 17:32:53 +0200
parents e9a7b671d707
children ecdf21f1d0c6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 /*
14
2d112b8a3756 Fix typo
David Demelier <markand@malikania.fr>
parents: 12
diff changeset
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
bf25ed2cf42a Fix vim issue I guess
David Demelier <markand@malikania.fr>
parents: 8
diff changeset
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
8
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
34 if (unit == 0 || !(arr = malloc(sizeof (struct array))))
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
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 arr->bsize = (bsize == 0) ? ARRAY_DEFAULT_BSIZE : bsize;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 arr->flags = flags;
8
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
39 arr->unit = unit;
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
40 arr->size = SIZE(bsize);
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
41 arr->length = 0;
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
42
8
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
43 if (!(arr->data = malloc(arr->size))) {
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
44 free(arr);
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
45 return NULL;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
46 }
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 if (data)
12
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
49 memcpy(arr->data, data, arr->unit);
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
50
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
51 return arr;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
52 }
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 * 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
56 * of object (about 100000). If you need to add a lot of data please consider
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
57 * using linked list instead or use array_append and then use reverse foreach
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
58 * functions.
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
12
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
67 memmove(arr->data + arr->unit, arr->data, SIZE(arr->length++));
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
68 memcpy(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 /*
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
74 * Insert the data to the specified index. The function returns -1 on
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
75 * allocation failure if the array need to grow or when the index is out
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
76 * of bounds otherwise 0 is returned.
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
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
79 int
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
80 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
81 {
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
82 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
83 return -1;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
84
12
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
85 memmove(arr->data + SIZE(index + 1), arr->data + SIZE(index),
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
86 SIZE(arr->length++ - index));
12
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
87 memcpy(arr->data + SIZE(index), data, arr->unit);
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
88
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
89 return 0;
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 /*
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
93 * Append the data to the end of array.
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
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
96 int
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
97 array_append(struct array *arr, const void *data)
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
98 {
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
99 if (array_grow(arr) < 0)
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
100 return -1;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
101
12
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
102 memcpy(arr->data + SIZE(arr->length++), data, arr->unit);
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
103
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
104 return 0;
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
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
107 /*
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
108 * Remove the array's head and return the object or NULL if
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
109 * the array is empty.
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
110 */
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
111
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
112 void *
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
113 array_pop(struct array *arr)
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
114 {
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
115 void *data;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
116
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
117 if (arr->length == 0)
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
118 return NULL;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
119
12
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
120 data = arr->data;
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
121 memmove(arr->data, arr->data + SIZE(1), SIZE(arr->length));
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
122 memset(arr->data + SIZE(--arr->length), 0, arr->unit);
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
123
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
124 return data;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
125 }
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
126
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
127 /*
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
128 * Remove the array's queue and return the object or NULL
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
129 * if the array is empty.
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
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
132 void *
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
133 array_unqueue(struct array *arr)
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
134 {
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
135 void *data;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
136
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
137 if (arr->length == 0)
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
138 return NULL;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
139
12
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
140 data = arr->data + SIZE(--arr->length);
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
141 memset(arr->data + SIZE(arr->length), 0, arr->unit);
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
142
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
143 return data;
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 /*
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
147 * Remove the entry at the specified index and return it. If the index is out of
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
148 * bounds or the list is empty the functions returns NULL.
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
149 */
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
150
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
151 void *
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
152 array_remove(struct array *arr, int index)
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
153 {
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
154 void *data;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
155
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
156 if (arr->length == 0 || index < 0 || index > arr->length - 1)
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
157 return NULL;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
158
12
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
159 data = arr->data + SIZE(index);
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
160 memmove(arr->data + SIZE(index), arr->data + SIZE(index + 1),
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
161 SIZE(arr->length - index));
12
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
162 memset(arr->data + SIZE(--arr->length), 0, arr->unit);
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
163
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
164 return data;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
165 }
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
166
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
167 /*
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
168 * 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
169 * argument to the function too.
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
170 */
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
171
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
172 void
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
173 array_map(struct array *arr, void (*fn)(void *, void *), void *udata)
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
174 {
8
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
175 int i;
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
176
8
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
177 for (i = 0; i < arr->length; ++i)
12
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
178 fn(arr->data + i, udata);
6
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
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
181 /*
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
182 * 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
183 * 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
184 * 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
185 * NULL.
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
186 */
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 void *
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
189 array_find(struct array *arr, int (*fn)(void *, void *), void *udata, int *idx)
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
190 {
8
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
191 int st, i;
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
192 void *data;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
193
8
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
194 for (i = st = 0; i < arr->length && !st; ++i)
12
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
195 st = fn(arr->data + i, udata);
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
196
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
197 if (st) {
12
cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security
David Demelier <markand@malikania.fr>
parents: 10
diff changeset
198 data = arr->data + --i;
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
199 if (idx)
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
200 *idx = i;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
201 } else
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
202 data = NULL;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
203
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
204 return data;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
205 }
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
206
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
207 /*
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
208 * 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
209 * 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
210 */
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 void
8
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
213 array_clear(struct array *arr)
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 memset(arr->data, 0, arr->size);
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
216 arr->length = 0;
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 * 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
221 */
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
222
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
223 void
8
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
224 array_free(struct array *arr)
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
225 {
8
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
226 array_clear(arr);
6
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 free(arr->data);
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
229 free(arr);
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
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
232 /*
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
233 * 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
234 * 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
235 * succeeded.
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
236 */
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
237
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
238 static int
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
239 array_grow(struct array *arr)
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
240 {
17
e9a7b671d707 Use char * instead of void, MSVC does not like void * arithmetic
David Demelier <markand@malikania.fr>
parents: 14
diff changeset
241 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
242 return 0;
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 if (arr->flags & ARRAY_AUTO) {
8
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
245 if (!(arr->data = realloc(arr->data, arr->size +
127254037b30 Switch to a void * array instead of void **
David Demelier <markand@malikania.fr>
parents: 7
diff changeset
246 SIZE(arr->bsize))))
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
247 return -1;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
248
10
da47652b60c5 Fix security issue
David Demelier <markand@malikania.fr>
parents: 9
diff changeset
249 arr->size += SIZE(arr->bsize);
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
250 } else
17
e9a7b671d707 Use char * instead of void, MSVC does not like void * arithmetic
David Demelier <markand@malikania.fr>
parents: 14
diff changeset
251 return ((arr->size / arr->unit) <= (size_t) arr->length) ? -1 : 0;
6
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
252
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
253 return 0;
25cc379de564 Added array.c and array.h:
David Demelier <markand@malikania.fr>
parents:
diff changeset
254 }