Merge branch 'ff/c99' into next

* ff/c99: Remove all void-pointer arithmetic.
2006-06-21 03:51:59 -07:00
parent 3bec0da08d 1d7f171c3a
commit 9d24ed4f01
19 changed files with 72 additions and 69 deletions
--- a/http-push.c
+++ b/http-push.c
@ -196,7 +196,7 @@ static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
 	struct transfer_request *request = (struct transfer_request *)data;
 	do {
 		ssize_t retval = write(request->local_fileno,
-				       ptr + posn, size - posn);
+				       (char *) ptr + posn, size - posn);
 		if (retval < 0)
 			return posn;
 		posn += retval;