diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-21 03:51:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-21 03:51:59 -0700 |
| commit | 9d24ed4f019e035eeb8125c2c595876ad1211a3a (patch) | |
| tree | c9841029a92f8f5d509eacdc88f7e6364b40ec2c /patch-delta.c | |
| parent | 3bec0da08d6df03a103ddc4237cf2c79992c7dd4 (diff) | |
| parent | 1d7f171c3a456b980d821ee0f68e01535a5f7e36 (diff) | |
| download | git-9d24ed4f019e035eeb8125c2c595876ad1211a3a.tar.gz git-9d24ed4f019e035eeb8125c2c595876ad1211a3a.tar.xz | |
Merge branch 'ff/c99' into next
* ff/c99:
Remove all void-pointer arithmetic.
Diffstat (limited to 'patch-delta.c')
| -rw-r--r-- | patch-delta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-delta.c b/patch-delta.c index 8f318ed8a..e3a1d425e 100644 --- a/patch-delta.c +++ b/patch-delta.c @@ -25,7 +25,7 @@ void *patch_delta(const 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(const 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) { |