summaryrefslogtreecommitdiff
path: root/builtin-tar-tree.c
diff options
context:
space:
mode:
authorRene Scharfe <rene.scharfe@lsrfire.ath.cx>2006-06-18 10:58:01 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-18 11:18:43 (GMT)
commit6698060c15e837babb3b80f980bbed290934a692 (patch)
treebdd2c93e2d03266f552627302a28775678776d05 /builtin-tar-tree.c
parent9236cdd488c26ec09e23adec34f64fd6fca3dc7c (diff)
downloadgit-6698060c15e837babb3b80f980bbed290934a692.zip
git-6698060c15e837babb3b80f980bbed290934a692.tar.gz
git-6698060c15e837babb3b80f980bbed290934a692.tar.bz2
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.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c
index f646c5b..39a61b6 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) {