X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=sha1_file.c;h=6d6073da85d297b4b0a59c0548720b21fc23129d;hb=180926636e47ecfe28d03cec493af75899994f0f;hp=e648c068b558fbdbbdc866c8829af3641e2c5b60;hpb=5d6ccf5ce7f28e576a87f6c6f4f99fae90e06db6;p=git.git

diff --git a/sha1_file.c b/sha1_file.c
index e648c068..6d6073da 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -332,7 +332,7 @@ int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void
 void *unpack_sha1_rest(z_stream *stream, void *buffer, unsigned long size)
 {
 	int bytes = strlen(buffer) + 1;
-	char *buf = xmalloc(1+size);
+	unsigned char *buf = xmalloc(1+size);
 
 	memcpy(buf, buffer + bytes, stream->total_out - bytes);
 	bytes = stream->total_out - bytes;
@@ -472,7 +472,7 @@ int sha1_file_size(const unsigned char *sha1, unsigned long *sizep)
 	 * The initial part of the delta starts at delta_data_head +
 	 * 20.  Borrow code from patch-delta to read the result size.
 	 */
-	data = hdr + strlen(hdr) + 1 + 20;
+	data = (unsigned char *)(hdr + strlen(hdr) + 1 + 20);
 
 	/* Skip over the source size; we are not interested in
 	 * it and we cannot verify it because we do not want