Mercurial > code
changeset 64:9cc5d6d0563e
Add more cast for old gcc and other cc
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 09 Nov 2011 19:40:20 +0100 |
parents | d78c4d9fad13 |
children | b2cd1fd33bb0 |
files | array.c |
diffstat | 1 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/array.c Wed Nov 09 19:30:33 2011 +0100 +++ b/array.c Wed Nov 09 19:40:20 2011 +0100 @@ -60,8 +60,8 @@ if (array_grow(arr) < 0) return -1; - memmove((char *) arr->data + arr->unit, arr->data, OFFSET(arr->length++)); - memcpy((char *) arr->data, data, arr->unit); + memmove((char *)arr->data + arr->unit, arr->data, OFFSET(arr->length++)); + memcpy((char *)arr->data, data, arr->unit); return 0; } @@ -77,9 +77,9 @@ if (index > arr->length - 1 || index < 0 || array_grow(arr) < 0) return -1; - memmove((char *) arr->data + OFFSET(index + 1), - (char *) arr->data + OFFSET(index), OFFSET(arr->length++ - index)); - memcpy((char *) arr->data + OFFSET(index), data, arr->unit); + memmove((char *)arr->data + OFFSET(index + 1), + (char *)arr->data + OFFSET(index), OFFSET(arr->length++ - index)); + memcpy((char *)arr->data + OFFSET(index), data, arr->unit); return 0; } @@ -94,7 +94,7 @@ if (array_grow(arr) < 0) return -1; - memcpy((char *) arr->data + OFFSET(arr->length++), data, arr->unit); + memcpy((char *)arr->data + OFFSET(arr->length++), data, arr->unit); return 0; } @@ -107,9 +107,9 @@ array_pop(struct array *arr) { if (arr->length > 0) { - memmove((char *) arr->data, (char *) arr->data + OFFSET(1), + memmove((char *)arr->data, (char *)arr->data + OFFSET(1), OFFSET(--arr->length)); - memset((char *) arr->data + OFFSET(arr->length), 0, arr->unit); + memset((char *)arr->data + OFFSET(arr->length), 0, arr->unit); } } @@ -121,7 +121,7 @@ array_unqueue(struct array *arr) { if (arr->length > 0) - memset((char *) arr->data + OFFSET(--arr->length), 0, arr->unit); + memset((char *)arr->data + OFFSET(--arr->length), 0, arr->unit); } /* @@ -132,10 +132,10 @@ array_remove(struct array *arr, int index) { if (arr->length > 0 && index >= 0 && index < arr->length) { - memmove((char *) arr->data + OFFSET(index), - (char *) arr->data + OFFSET(index + 1), + memmove((char *)arr->data + OFFSET(index), + (char *)arr->data + OFFSET(index + 1), OFFSET(arr->length - index - 1)); - memset((char *) arr->data + OFFSET(--arr->length), 0, arr->unit); + memset((char *)arr->data + OFFSET(--arr->length), 0, arr->unit); } } @@ -151,7 +151,7 @@ int i; for (i = 0; i < arr->length; ++i) { - elm = (char *) arr->data + OFFSET(i); + elm = (char *)arr->data + OFFSET(i); if (memcmp(elm, data, arr->unit) == 0) array_remove(arr, i); @@ -181,10 +181,10 @@ if ((tmp = malloc(arr->unit)) == NULL) return -1; - memcpy((char *) tmp, (char *) arr->data + OFFSET(i1), arr->unit); - memcpy((char *) arr->data + OFFSET(i1), (char *) arr->data + OFFSET(i2), + memcpy((char *)tmp, (char *)arr->data + OFFSET(i1), arr->unit); + memcpy((char *)arr->data + OFFSET(i1), (char *)arr->data + OFFSET(i2), arr->unit); - memcpy((char *) arr->data + OFFSET(i2), (char *) tmp, arr->unit); + memcpy((char *)arr->data + OFFSET(i2), (char *)tmp, arr->unit); /* * Clear bytes for safety you probably don't want a password or @@ -209,13 +209,13 @@ int found, i1, i2; for (i1 = found = 0; !found && i1 < arr->length; ++i1) - found = memcmp(arr->data + OFFSET(i1), o1, arr->unit) == 0; + found = memcmp((char *)arr->data + OFFSET(i1), o1, arr->unit) == 0; if (!found) return -1; for (i2 = found = 0; !found && i2 < arr->length; ++i2) - found = memcmp(arr->data + OFFSET(i2), o2, arr->unit) == 0; + found = memcmp((char *)arr->data + OFFSET(i2), o2, arr->unit) == 0; if (!found) return -1; @@ -234,7 +234,7 @@ int i; for (i = 0; i < arr->length; ++i) - fn((char *) arr->data + OFFSET(i), udata); + fn((char *)arr->data + OFFSET(i), udata); } /* @@ -251,10 +251,10 @@ void *data; for (i = st = 0; i < arr->length && st != 1; ++i) - st = fn((char *) arr->data + OFFSET(i), u); + st = fn((char *)arr->data + OFFSET(i), u); if (st) { - data = (char *) arr->data + OFFSET(--i); + data = (char *)arr->data + OFFSET(--i); if (ix) *ix = i; } else