changeset 12:cbfe95c9f7b7

Fix compiler warning (thanks gcc 4.2.2) and security
author David Demelier <markand@malikania.fr>
date Wed, 07 Sep 2011 21:54:15 +0200
parents 7360d752183e
children 596f33ecc087
files array.c
diffstat 1 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/array.c	Wed Sep 07 21:12:48 2011 +0200
+++ b/array.c	Wed Sep 07 21:54:15 2011 +0200
@@ -46,7 +46,7 @@
 	}
 
 	if (data)
-		memcpy(&arr->data[0], data, arr->unit);
+		memcpy(arr->data, data, arr->unit);
 
 	return arr;
 }
@@ -64,8 +64,8 @@
 	if (array_grow(arr) < 0)
 		return -1;
 
-	memmove(&arr->data[arr->unit], &arr->data[0], SIZE(arr->length++));
-	memcpy(&arr->data[0], data, arr->unit);
+	memmove(arr->data + arr->unit, arr->data, SIZE(arr->length++));
+	memcpy(arr->data, data, arr->unit);
 
 	return 0;
 }
@@ -82,9 +82,9 @@
 	if (index > arr->length - 1 || index < 0 || array_grow(arr) < 0)
 		return -1;
 
-	memmove(&arr->data[SIZE(index + 1)], &arr->data[SIZE(index)],
+	memmove(arr->data + SIZE(index + 1), arr->data + SIZE(index),
 	    SIZE(arr->length++ - index));
-	memcpy(&arr->data[SIZE(index)], data, arr->unit);
+	memcpy(arr->data + SIZE(index), data, arr->unit);
 
 	return 0;
 }
@@ -99,7 +99,7 @@
 	if (array_grow(arr) < 0)
 		return -1;
 
-	memcpy(&arr->data[SIZE(arr->length++)], data, arr->unit);
+	memcpy(arr->data + SIZE(arr->length++), data, arr->unit);
 
 	return 0;
 }
@@ -117,9 +117,9 @@
 	if (arr->length == 0)
 		return NULL;
 
-	data = &arr->data[0];
-	memmove(&arr->data[0], &arr->data[SIZE(1)], SIZE(arr->length));
-	memset(&arr->data[SIZE(--arr->length)], 0, arr->unit);
+	data = arr->data;
+	memmove(arr->data, arr->data + SIZE(1), SIZE(arr->length));
+	memset(arr->data + SIZE(--arr->length), 0, arr->unit);
 
 	return data;
 }
@@ -137,8 +137,8 @@
 	if (arr->length == 0)
 		return NULL;
 
-	data = &arr->data[SIZE(--arr->length)];
-	memset(&arr->data[SIZE(arr->length)], 0, arr->unit);
+	data = arr->data + SIZE(--arr->length);
+	memset(arr->data + SIZE(arr->length), 0, arr->unit);
 
 	return data;
 }
@@ -156,10 +156,10 @@
 	if (arr->length == 0 || index < 0 || index > arr->length - 1)
 		return NULL;
 
-	data = &arr->data[index];
-	memmove(&arr->data[index], &arr->data[index + 1],
+	data = arr->data + SIZE(index);
+	memmove(arr->data + SIZE(index), arr->data + SIZE(index + 1),
 	    SIZE(arr->length - index));
-	memset(&arr->data[SIZE(--arr->length)], 0, arr->unit);
+	memset(arr->data + SIZE(--arr->length), 0, arr->unit);
 
 	return data;
 }
@@ -175,7 +175,7 @@
 	int i;
 
 	for (i = 0; i < arr->length; ++i)
-		fn(&arr->data[i], udata);
+		fn(arr->data + i, udata);
 }
 
 /*
@@ -192,10 +192,10 @@
 	void *data;
 
 	for (i = st = 0; i < arr->length && !st; ++i)
-		st = fn(&arr->data[i], udata);
+		st = fn(arr->data + i, udata);
 
 	if (st)	{
-		data = &arr->data[--i];
+		data = arr->data + --i;
 		if (idx)
 			*idx = i;
 	} else