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 /csum-file.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 'csum-file.c')
| -rw-r--r-- | csum-file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/csum-file.c b/csum-file.c index 5f9249aee..ebaad0397 100644 --- a/csum-file.c +++ b/csum-file.c @@ -17,7 +17,7 @@ static int sha1flush(struct sha1file *f, unsigned int count) for (;;) { int ret = xwrite(f->fd, buf, count); if (ret > 0) { - buf += ret; + buf = (char *) buf + ret; count -= ret; if (count) continue; @@ -57,7 +57,7 @@ int sha1write(struct sha1file *f, void *buf, unsigned int count) memcpy(f->buffer + offset, buf, nr); count -= nr; offset += nr; - buf += nr; + buf = (char *) buf + nr; left -= nr; if (!left) { SHA1_Update(&f->ctx, f->buffer, offset); |