Merge branch 'jc/apply'

[git.git] / patch-delta.c

diff --git a/patch-delta.c b/patch-delta.c
index affd4f673d15657306acb74f2446d636a34c4fa5..e3a1d425ee2e333bce0f87b1e50fc112a8ec51a3 100644 (file)
--- a/patch-delta.c
+++ b/patch-delta.c
@@ -13,7 +13,7 @@
 #include <string.h>
 #include "delta.h"
 
-void *patch_delta(void *src_buf, unsigned long src_size,
+void *patch_delta(const void *src_buf, unsigned long src_size,
                  const void *delta_buf, unsigned long delta_size,
                  unsigned long *dst_size)
 {
@@ -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) {