diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-22 13:18:51 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-22 13:18:51 +0400 |
commit | e94528a0e99ea54520b8aff016275a7622c55a47 (patch) | |
tree | bd4910fd81a2c85a67b2325f72c923b12875bf06 /pkt-line.c | |
parent | c0a2e1c0ba0956951b566888340e66589901b72d (diff) | |
parent | 1d7f171c3a456b980d821ee0f68e01535a5f7e36 (diff) |
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 'pkt-line.c')
-rw-r--r-- | pkt-line.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkt-line.c b/pkt-line.c index bb3bab05cd..44d42969e5 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -21,7 +21,7 @@ static void safe_write(int fd, const void *buf, unsigned n) while (n) { int ret = xwrite(fd, buf, n); if (ret > 0) { - buf += ret; + buf = (char *) buf + ret; n -= ret; continue; } @@ -66,7 +66,7 @@ static void safe_read(int fd, void *buffer, unsigned size) int n = 0; while (n < size) { - int ret = xread(fd, buffer + n, size - n); + int ret = xread(fd, (char *) buffer + n, size - n); if (ret < 0) die("read error (%s)", strerror(errno)); if (!ret) |