X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=patch-delta.c;h=e3a1d425ee2e333bce0f87b1e50fc112a8ec51a3;hb=35ef237cf630418c2e45752eb527268693a2895b;hp=d95f0d9721dd87c0d4aff485e32e0a68623ee5cc;hpb=3d990f110c2e5b8df83f6ab3ef83497f43c7fd47;p=git.git

diff --git a/patch-delta.c b/patch-delta.c
index d95f0d972..e3a1d425e 100644
--- a/patch-delta.c
+++ b/patch-delta.c
@@ -13,8 +13,8 @@
 #include <string.h>
 #include "delta.h"
 
-void *patch_delta(void *src_buf, unsigned long src_size,
-		  void *delta_buf, unsigned long delta_size,
+void *patch_delta(const void *src_buf, unsigned long src_size,
+		  const void *delta_buf, unsigned long delta_size,
 		  unsigned long *dst_size)
 {
 	const unsigned char *data, *top;
@@ -25,7 +25,7 @@ void *patch_delta(void *src_buf, unsigned long src_size,
 		return NULL;
 
 	data = delta_buf;
-	top = delta_buf + delta_size;
+	top = (const unsigned char *) delta_buf + delta_size;
 
 	/* make sure the orig file size matches what we expect */
 	size = get_delta_hdr_size(&data, top);
@@ -56,7 +56,7 @@ void *patch_delta(void *src_buf, unsigned long src_size,
 			    cp_off + cp_size > src_size ||
 			    cp_size > size)
 				goto bad;
-			memcpy(out, src_buf + cp_off, cp_size);
+			memcpy(out, (char *) src_buf + cp_off, cp_size);
 			out += cp_size;
 			size -= cp_size;
 		} else if (cmd) {