code: array.c annotate

annotate array.c @ 52:14c0b77f679b

Add buffer_shrink in buffer_end() and security if realloc fails

author	David Demelier <markand@malikania.fr>
date	Wed, 02 Nov 2011 16:19:20 +0100
parents	cdae3689f1b6
children	8a8db17c02a4

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
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	25 #define OFFSET(x) (arr->unit * (x))
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	26
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	27 static int array_grow(struct array *);
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	28
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	29 struct array *
48 cdae3689f1b6 Update of array and cosmetic in ARRAY_ macros David Demelier <markand@malikania.fr> parents: 43 diff changeset	30 array_new(enum array_type type, size_t unit, int length)
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	31 {
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	32 struct array *arr;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	33
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 26 diff changeset	34 if (unit == 0 \|\| (arr = malloc(sizeof (struct array))) == NULL)
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	35 return NULL;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	36
34 653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	37 memset(arr, 0, sizeof (struct array));
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	38 arr->type = type;
48 cdae3689f1b6 Update of array and cosmetic in ARRAY_ macros David Demelier <markand@malikania.fr> parents: 43 diff changeset	39 arr->bsize = (length == 0) ? ARRAY_DEFAULT_BSIZE : length;
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	40 arr->unit = unit;
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	41 arr->size = OFFSET(arr->bsize);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	42
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 26 diff changeset	43 if ((arr->data = malloc(arr->size)) == NULL) {
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 return arr;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	49 }
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 /*
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	52 * 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	53 * 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	54 * using linked list instead.
6 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
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	57 int
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	58 array_push(struct array arr, const void data)
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 if (array_grow(arr) < 0)
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	61 return -1;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	62
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	63 memmove((char *) arr->data + arr->unit, arr->data, OFFSET(arr->length++));
25 e09000fc013a Switch to void * thus the user do not need to cast David Demelier <markand@malikania.fr> parents: 23 diff changeset	64 memcpy((char *) arr->data, data, arr->unit);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	65
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	66 return 0;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	67 }
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	68
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	69 /*
26 4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	70 * Insert the data at the specified index. The function returns -1 on
4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	71 * 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	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 int
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	75 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	76 {
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	77 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	78 return -1;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	79
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	80 memmove((char *) arr->data + OFFSET(index + 1),
e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	81 (char *) arr->data + OFFSET(index), OFFSET(arr->length++ - index));
e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	82 memcpy((char *) arr->data + OFFSET(index), data, arr->unit);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	83
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	84 return 0;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	85 }
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	86
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 * Append the data to the end of array.
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 int
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	92 array_append(struct array arr, const void data)
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 if (array_grow(arr) < 0)
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	95 return -1;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	96
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	97 memcpy((char *) arr->data + OFFSET(arr->length++), data, arr->unit);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	98
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	99 return 0;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	100 }
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	101
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	102 /*
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	103 * Remove the array's head.
6 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
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	106 void
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	107 array_pop(struct array *arr)
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	108 {
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	109 if (arr->length > 0) {
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	110 memmove((char ) arr->data, (char ) arr->data + OFFSET(1),
e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	111 OFFSET(--arr->length));
e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	112 memset((char *) arr->data + OFFSET(arr->length), 0, arr->unit);
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	113 }
6 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
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	116 /*
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	117 * Remove the array's tail.
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	118 */
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	119
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	120 void
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	121 array_unqueue(struct array *arr)
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	122 {
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	123 if (arr->length > 0)
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	124 memset((char *) arr->data + OFFSET(--arr->length), 0, arr->unit);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	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 /*
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	128 * Remove the data at the specified index. Bounds are checked.
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	129 */
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	130
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	131 void
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	132 array_remove(struct array *arr, int index)
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	133 {
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	134 if (arr->length > 0 && index >= 0 && index < arr->length) {
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	135 memmove((char *) arr->data + OFFSET(index),
e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	136 (char *) arr->data + OFFSET(index + 1),
e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	137 OFFSET(arr->length - index - 1));
e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	138 memset((char *) arr->data + OFFSET(--arr->length), 0, arr->unit);
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	139 }
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	140 }
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	141
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	142 /*
34 653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	143 * Remove the object referenced by the `data' argument. Useful when you
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	144 * don't know the index.
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	145 */
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	146
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	147 void
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	148 array_unref(struct array arr, const void data)
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	149 {
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	150 void *elm;
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	151 int i;
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	152
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	153 for (i = 0; i < arr->length; ++i) {
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	154 elm = ARRAY_INDEX(arr, i);
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	155
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	156 if (memcmp(elm, data, arr->unit) == 0)
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	157 array_remove(arr, i);
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	158 }
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	159 }
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	160
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	161 /*
22 ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	162 * 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	163 * 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	164 * 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	165 */
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	166
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	167 int
43 f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	168 array_iswap(struct array *arr, int i1, int i2)
22 ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	169 {
48 cdae3689f1b6 Update of array and cosmetic in ARRAY_ macros David Demelier <markand@malikania.fr> parents: 43 diff changeset	170 void *tmp;
cdae3689f1b6 Update of array and cosmetic in ARRAY_ macros David Demelier <markand@malikania.fr> parents: 43 diff changeset	171
22 ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	172 /* Out of bounds */
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	173 if (i1 >= arr->length \|\| i1 < 0 \|\| i2 >= arr->length \|\| i2 < 0)
22 ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	174 return -1;
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 /*
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	177 * 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	178 * function.
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
48 cdae3689f1b6 Update of array and cosmetic in ARRAY_ macros David Demelier <markand@malikania.fr> parents: 43 diff changeset	181 if ((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	182 return -1;
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	183
48 cdae3689f1b6 Update of array and cosmetic in ARRAY_ macros David Demelier <markand@malikania.fr> parents: 43 diff changeset	184 memcpy((char ) tmp, (char ) arr->data + OFFSET(i1), arr->unit);
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	185 memcpy((char ) arr->data + OFFSET(i1), (char ) arr->data + OFFSET(i2),
26 4fd9ecbbb143 Code cosmetic David Demelier <markand@malikania.fr> parents: 25 diff changeset	186 arr->unit);
48 cdae3689f1b6 Update of array and cosmetic in ARRAY_ macros David Demelier <markand@malikania.fr> parents: 43 diff changeset	187 memcpy((char ) arr->data + OFFSET(i2), (char ) tmp, arr->unit);
34 653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	188
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	189 /*
48 cdae3689f1b6 Update of array and cosmetic in ARRAY_ macros David Demelier <markand@malikania.fr> parents: 43 diff changeset	190 * Clear bytes for safety you probably don't want a password or
cdae3689f1b6 Update of array and cosmetic in ARRAY_ macros David Demelier <markand@malikania.fr> parents: 43 diff changeset	191 * secure data to be left somewhere in the memory.
34 653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	192 */
653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	193
48 cdae3689f1b6 Update of array and cosmetic in ARRAY_ macros David Demelier <markand@malikania.fr> parents: 43 diff changeset	194 memset(tmp, 0, arr->unit);
cdae3689f1b6 Update of array and cosmetic in ARRAY_ macros David Demelier <markand@malikania.fr> parents: 43 diff changeset	195 free(tmp);
22 ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	196
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	197 return 0;
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	198 }
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	199
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	200 /*
43 f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	201 * Swap the two elements referenced by data `o1' and `o2'. This function
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	202 * may be slow on large arrays since it must travel all the object
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	203 * to find the indexes.
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	204 */
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	205
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	206 int
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	207 array_pswap(struct array arr, const void o1, const void *o2)
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	208 {
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	209 int found, i1, i2;
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	210
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	211 for (i1 = found = 0; !found && i1 < arr->length; ++i1)
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	212 found = memcmp(arr->data + OFFSET(i1), o1, arr->unit) == 0;
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	213
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	214 if (!found)
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	215 return -1;
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	216
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	217 for (i2 = found = 0; !found && i2 < arr->length; ++i2)
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	218 found = memcmp(arr->data + OFFSET(i2), o2, arr->unit) == 0;
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	219
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	220 if (!found)
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	221 return -1;
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	222
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	223 return array_iswap(arr, --i1, --i2);
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	224 }
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	225
f1e184940197 Same last commit for array too David Demelier <markand@malikania.fr> parents: 40 diff changeset	226 /*
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	227 * 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	228 * argument to the function too.
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	229 */
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	230
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	231 void
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	232 array_map(const struct array arr, void (fn)(void , void ), void *udata)
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	233 {
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	234 int i;
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	235
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	236 for (i = 0; i < arr->length; ++i)
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	237 fn((char *) arr->data + OFFSET(i), udata);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	238 }
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 * 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	242 * 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	243 * 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	244 * NULL.
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	245 */
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	246
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	247 void *
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	248 array_find(const struct array arr, int (fn)(void , void ), int ix, void u)
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	249 {
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	250 int st, i;
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	251 void *data;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	252
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 26 diff changeset	253 for (i = st = 0; i < arr->length && st != 1; ++i)
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	254 st = fn((char *) arr->data + OFFSET(i), u);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	255
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	256 if (st) {
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	257 data = (char *) arr->data + OFFSET(--i);
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	258 if (ix)
19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	259 *ix = i;
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	260 } else
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	261 data = NULL;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	262
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	263 return data;
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 /*
40 d741c948de89 Added a convenient macro PARRAY_FLUSH to free all objects David Demelier <markand@malikania.fr> parents: 35 diff changeset	267 * Erase every bytes and set the length to 0.
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	268 */
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 void
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	271 array_clear(struct array *arr)
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	272 {
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	273 memset(arr->data, 0, arr->size);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	274 arr->length = 0;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	275 }
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 /*
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	278 * 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	279 */
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	280
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	281 void
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	282 array_free(struct array *arr)
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	283 {
8 127254037b30 Switch to a void * array instead of void ** David Demelier <markand@malikania.fr> parents: 7 diff changeset	284 array_clear(arr);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	285
22 ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	286 if (arr->data)
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	287 free(arr->data);
ecdf21f1d0c6 Added a new function array_swap() that swap elements by index David Demelier <markand@malikania.fr> parents: 17 diff changeset	288
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	289 free(arr);
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	290 }
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	291
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	292 /*
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	293 * 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	294 * 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	295 * succeeded.
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	296 */
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	297
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	298 static int
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	299 array_grow(struct array *arr)
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	300 {
17 e9a7b671d707 Use char * instead of void, MSVC does not like void * arithmetic David Demelier <markand@malikania.fr> parents: 14 diff changeset	301 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	302 return 0;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	303
34 653bb22d3c0c For array.c: David Demelier <markand@malikania.fr> parents: 31 diff changeset	304 if (arr->type == ARRAY_AUTO) {
28 904a373aa120 Buffer security fix. Also switched to == NULL statement instead of ! as David Demelier <markand@malikania.fr> parents: 26 diff changeset	305 if ((arr->data = realloc(arr->data, arr->size +
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	306 OFFSET(arr->bsize))) == NULL)
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	307 return -1;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	308
30 e2c3a0a549d2 Rename SIZE -> OFFSET David Demelier <markand@malikania.fr> parents: 29 diff changeset	309 arr->size += OFFSET(arr->bsize);
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	310 } else
29 19c0d2e11406 Security fixes for array David Demelier <markand@malikania.fr> parents: 28 diff changeset	311 return -1;
6 25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	312
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	313 return 0;
25cc379de564 Added array.c and array.h: David Demelier <markand@malikania.fr> parents: diff changeset	314 }

Mercurial > code

annotate array.c @ 52:14c0b77f679b