From: Rene Scharfe Date: Sun, 18 Jun 2006 10:58:01 +0000 (+0200) Subject: git-tar-tree: no more void pointer arithmetic X-Git-Tag: v1.4.1-rc1~3^2~17 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6698060c15e837babb3b80f980bbed290934a692;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c index f646c5bd6..39a61b629 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) {