code: array.c annotate

annotate array.c @ 28:904a373aa120

Buffer security fix. Also switched to == NULL statement instead of ! as advised in man style(9)

author	David Demelier <markand@malikania.fr>
date	Thu, 22 Sep 2011 13:03:27 +0200
parents	4fd9ecbbb143
children	19c0d2e11406

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
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 4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	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 4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	74 * Insert the data at the specified index. The function returns -1 on
4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	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 4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	84 memmove((char *) arr->data + SIZE(index + 1),
4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	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 /*
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	107 * 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	108 * the array is empty.
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	109 */
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 void *
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	112 array_pop(struct array *arr)
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	113 {
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	114 void *data;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	115
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	116 if (arr->length == 0)
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	117 return NULL;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	118
12 cbfe95c9f7b7 Fix compiler warning (thanks gcc 4.2.2) and security David Demelier <markand@malikania.fr> parents: 10 diff changeset	119 data = arr->data;
25 e09000fc013a Switch to void * thus the user do not need to cast David Demelier <markand@malikania.fr> parents: 23 diff changeset	120 memmove((char ) arr->data, (char ) arr->data + SIZE(1),
e09000fc013a Switch to void * thus the user do not need to cast David Demelier <markand@malikania.fr> parents: 23 diff changeset	121 SIZE(arr->length));
e09000fc013a Switch to void * thus the user do not need to cast David Demelier <markand@malikania.fr> parents: 23 diff changeset	122 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	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
25 e09000fc013a Switch to void * thus the user do not need to cast David Demelier <markand@malikania.fr> parents: 23 diff changeset	140 data = (char *) 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	141 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	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
25 e09000fc013a Switch to void * thus the user do not need to cast David Demelier <markand@malikania.fr> parents: 23 diff changeset	159 data = (char *) arr->data + SIZE(index);
26 4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	160 memmove((char *) arr->data + SIZE(index),
4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	161 (char *) arr->data + SIZE(index + 1), 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	162 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	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 /*
22 ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	168 * 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	169 * 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	170 * 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	171 */
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	172
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	173 int
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	174 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	175 {
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	176 /* Out of bounds */
26 4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	177 if (i1 > arr->length - 1\|\| i1 < 0 \|\| i2 > arr->length - 1 \|\| i2 < 0)
22 ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	178 return -1;
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	179
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	180 /*
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	181 * 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	182 * function.
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	183 */
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	184
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 26 diff changeset	185 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	186 return -1;
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	187
25 e09000fc013a Switch to void * thus the user do not need to cast David Demelier <markand@malikania.fr> parents: 23 diff changeset	188 memcpy((char ) arr->tmp, (char ) arr->data + SIZE(i1), arr->unit);
26 4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	189 memcpy((char ) arr->data + SIZE(i1), (char ) arr->data + SIZE(i2),
4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	190 arr->unit);
25 e09000fc013a Switch to void * thus the user do not need to cast David Demelier <markand@malikania.fr> parents: 23 diff changeset	191 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	192
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	193 return 0;
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	194 }
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	195
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	196 /*
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	197 * 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	198 * argument to the function too.
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	199 */
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	200
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	201 void
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	202 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	203 {
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	204 int i;
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	205
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	206 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	207 fn((char *) arr->data + SIZE(i), udata);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	208 }
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	209
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	210 /*
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	211 * 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	212 * 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	213 * 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	214 * NULL.
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
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	217 void *
25 e09000fc013a Switch to void * thus the user do not need to cast David Demelier <markand@malikania.fr> parents: 23 diff changeset	218 array_find(struct array arr, int (fn)(void , void ), int idx, void udata)
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	219 {
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	220 int st, i;
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	221 void *data;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	222
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 26 diff changeset	223 for (i = st = 0; i < arr->length && st != 1; ++i)
25 e09000fc013a Switch to void * thus the user do not need to cast David Demelier <markand@malikania.fr> parents: 23 diff changeset	224 st = fn((char *) arr->data + SIZE(i), udata);
6 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 if (st) {
25 e09000fc013a Switch to void * thus the user do not need to cast David Demelier <markand@malikania.fr> parents: 23 diff changeset	227 data = (char *) arr->data + SIZE(--i);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	228 if (idx)
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	229 *idx = i;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	230 } else
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	231 data = NULL;
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 return data;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	234 }
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	235
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 * 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	238 * 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	239 */
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	240
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	241 void
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	242 array_clear(struct array *arr)
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	243 {
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	244 memset(arr->data, 0, arr->size);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	245 arr->length = 0;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	246 }
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	247
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 * 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	250 */
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	251
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	252 void
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	253 array_free(struct array *arr)
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	254 {
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	255 array_clear(arr);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	256
22 ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	257 if (arr->data)
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	258 free(arr->data);
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	259 if (arr->tmp)
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	260 free(arr->tmp);
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	261
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	262 free(arr);
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	263 }
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 /*
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	266 * 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	267 * 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	268 * succeeded.
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	269 */
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	270
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	271 static int
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	272 array_grow(struct array *arr)
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	273 {
17 e9a7b671d707 Use char * instead of void, MSVC does not like void * arithmetic David Demelier <markand@malikania.fr> parents: 14 diff changeset	274 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	275 return 0;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	276
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	277 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	278 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	279 SIZE(arr->bsize))) == NULL)
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	280 return -1;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	281
10 da47652b60c5 Fix security issue David Demelier <markand@malikania.fr> parents: 9 diff changeset	282 arr->size += SIZE(arr->bsize);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	283 } else
26 4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	284 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	285
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	286 return 0;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	287 }

Mercurial > code

annotate array.c @ 28:904a373aa120