diff options
| author | Florian Forster <octo@verplant.org> | 2006-06-18 17:18:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-20 01:59:46 -0700 |
| commit | 1d7f171c3a456b980d821ee0f68e01535a5f7e36 (patch) | |
| tree | 040ae96db3e2d18f84a95cc46ec4d7626bcc1994 /patch-delta.c | |
| parent | 2bda77e080dd8d47ca0b87c78e9061fbaa37455a (diff) | |
| download | git-1d7f171c3a456b980d821ee0f68e01535a5f7e36.tar.gz | |
Remove all void-pointer arithmetic.
ANSI C99 doesn't allow void-pointer arithmetic. This patch fixes this in
various ways. Usually the strategy that required the least changes was used.
Signed-off-by: Florian Forster <octo@verplant.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 8f318ed8aa..e3a1d425ee 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) { |