code: array.c comparison

Modified [p]array_find to return the index for a better usage

author	David Demelier <markand@malikania.fr>
date	Thu, 10 Nov 2011 18:27:04 +0100
parents	9cc5d6d0563e
children	b3ba5f5df3b9

comparison

equal deleted inserted replaced

-:f773c76b1f3c
+:cff6869fbc94
 * Apply the function `fn' on each object and give the optional `udata'
 * argument to the function too.
 */
 void
-array_map(const struct array *arr, void (*fn)(void *, void *), void *udata)
+array_map(const struct array *arr, array_map_fn fn, void *udata)
 {
 	int i;
 	for (i = 0; i < arr->length; ++i)
 		fn((char *)arr->data + OFFSET(i), udata);
 }
 /*
 * Compare each object with the user supplied function. If the `fn' function
-* returns 1 then the data is returned. Optional idx argument can be set to
+* returns 1 then the index of the data position is returned and the parameter
-* indicate the data position. If the data was not found the function returns
+* data is filled with the array data at the correct index. If the comparison
-* NULL.
+* function nevers returns 1, array_find returns -1.
 */
-void *
+int
-array_find(const struct array *arr, int (*fn)(void *, void *), int *ix, void *u)
+array_find(const struct array *arr, array_cmp_fn fn, void *data, void *u)
 {
 	int st, i;
-	void *data;
 	for (i = st = 0; i < arr->length && st != 1; ++i)
 		st = fn((char *)arr->data + OFFSET(i), u);
-	if (st)	{
+	if (st)
-		data = (char *)arr->data + OFFSET(--i);
+		memcpy(data, (char *)arr->data + OFFSET(--i), arr->unit);
-		if (ix)
+	else
-			*ix = i;
+		i = -1;
-	} else
-		data = NULL;
+	return i;
-	return data;
 }
 /*
 * Erase every bytes and set the length to 0.
 */

Mercurial > code