annotate array.c @ 163:66d317ba4b80

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