diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-22 02:18:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-22 02:18:51 -0700 |
| commit | e94528a0e99ea54520b8aff016275a7622c55a47 (patch) | |
| tree | bd4910fd81a2c85a67b2325f72c923b12875bf06 /patch-delta.c | |
| parent | c0a2e1c0ba0956951b566888340e66589901b72d (diff) | |
| parent | 1d7f171c3a456b980d821ee0f68e01535a5f7e36 (diff) | |
| download | git-e94528a0e99ea54520b8aff016275a7622c55a47.tar.gz | |
Merge branch 'ff/c99'
* ff/c99:
Remove all void-pointer arithmetic.
Change types used in bitfields to be `int's.
Don't use empty structure initializers.
Cast pointers to `void *' when used in a format.
Don't instantiate structures with FAMs.
Initialize FAMs using `FLEX_ARRAY'.
Remove ranges from switch statements.
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) { |