From: Brandon Casey <drafnel@gmail.com>
Date: Fri, 14 Aug 2009 22:52:15 +0000 (-0500)
Subject: block-sha1/sha1.c: silence compiler complaints by casting void * to char *
X-Git-Tag: v1.6.5-rc0~30^2~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a12218572f2875e91b6c3c12559b076c4949a675;p=git-core%2Fgit.git

block-sha1/sha1.c: silence compiler complaints by casting void * to char *

Some compilers produce errors when arithmetic is attempted on pointers to
void.  We want computations done on byte addresses, so cast them to char *
to work them around.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c
index e5a100754..464cb258a 100644
--- a/block-sha1/sha1.c
+++ b/block-sha1/sha1.c
@@ -246,14 +246,14 @@ void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len)
 		memcpy(lenW + (char *)ctx->W, data, left);
 		lenW = (lenW + left) & 63;
 		len -= left;
-		data += left;
+		data = ((const char *)data + left);
 		if (lenW)
 			return;
 		blk_SHA1_Block(ctx, ctx->W);
 	}
 	while (len >= 64) {
 		blk_SHA1_Block(ctx, data);
-		data += 64;
+		data = ((const char *)data + 64);
 		len -= 64;
 	}
 	if (len)