archive-tar: use size_t in strbuf_append_ext_header()

One of its callers already passes in a size_t value.  Use it
consistently in this function.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/archive-tar.c b/archive-tar.c
index 3d76977c3f955ded0ecea03b80ad160eba917ade..29ca21649ee539e358ee584e91f35910eb40619a 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -142,10 +142,10 @@ static int stream_blocked(const struct object_id *oid)
  * string and appends it to a struct strbuf.
  */
 static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
  * string and appends it to a struct strbuf.
  */
 static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,

-                                    const char *value, unsigned int valuelen)
+                                    const char *value, size_t valuelen)

 {
        size_t orig_len = sb->len;
 {
        size_t orig_len = sb->len;

-       int len, tmp;
+       size_t len, tmp;

 
        /* "%u %s=%s\n" */
        len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1;
 
        /* "%u %s=%s\n" */
        len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1;


@@ -153,14 +153,14 @@ static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
                len++;
 
        strbuf_grow(sb, len);
                len++;
 
        strbuf_grow(sb, len);

-       strbuf_addf(sb, "%u %s=", len, keyword);
+       strbuf_addf(sb, "%"PRIuMAX" %s=", (uintmax_t)len, keyword);

        strbuf_add(sb, value, valuelen);
        strbuf_addch(sb, '\n');
 
        if (len != sb->len - orig_len)
        strbuf_add(sb, value, valuelen);
        strbuf_addch(sb, '\n');
 
        if (len != sb->len - orig_len)

-               warning("pax extended header length miscalculated as %d"
+               warning("pax extended header length miscalculated as %"PRIuMAX

                        ", should be %"PRIuMAX,
                        ", should be %"PRIuMAX,

-                       len, (uintmax_t)(sb->len - orig_len));
+                       (uintmax_t)len, (uintmax_t)(sb->len - orig_len));

 }
 
 /*
 }
 
 /*