diff options
| author | Rene Scharfe <rene.scharfe@lsrfire.ath.cx> | 2006-06-18 12:58:01 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-18 04:18:43 -0700 |
| commit | 6698060c15e837babb3b80f980bbed290934a692 (patch) | |
| tree | bdd2c93e2d03266f552627302a28775678776d05 /builtin-tar-tree.c | |
| parent | 9236cdd488c26ec09e23adec34f64fd6fca3dc7c (diff) | |
| download | git-6698060c15e837babb3b80f980bbed290934a692.tar.gz | |
git-tar-tree: no more void pointer arithmetic
Noticed by Florian Forster: Use a char pointer when adding offsets,
because void pointer arithmetic is a GNU extension. Const'ify the
function arguments while we're at it.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-tar-tree.c')
| -rw-r--r-- | builtin-tar-tree.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c index f646c5bd6e..39a61b6293 100644 --- a/builtin-tar-tree.c +++ b/builtin-tar-tree.c @@ -22,8 +22,10 @@ static unsigned long offset; static time_t archive_time; /* tries hard to write, either succeeds or dies in the attempt */ -static void reliable_write(void *buf, unsigned long size) +static void reliable_write(const void *data, unsigned long size) { + const char *buf = data; + while (size > 0) { long ret = xwrite(1, buf, size); if (ret < 0) { @@ -51,8 +53,9 @@ static void write_if_needed(void) * queues up writes, so that all our write(2) calls write exactly one * full block; pads writes to RECORDSIZE */ -static void write_blocked(void *buf, unsigned long size) +static void write_blocked(const void *data, unsigned long size) { + const char *buf = data; unsigned long tail; if (offset) { |