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>

diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c
index f646c5bd6e01f07e6b6046e465ff9044d20f0c8f..39a61b629367df9dd274acf5fa310b45dd06f126 100644 (file)
--- 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 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) {
        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
  */
  * 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) {
        unsigned long tail;
 
        if (offset) {