summaryrefslogtreecommitdiff
path: root/archive-tar.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2019-08-17 16:24:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-08-19 17:49:00 (GMT)
commit17e9ef00d29b349727e3c710869217a36ad08224 (patch)
tree1a00a9514e3ab7c16d896676b7277305e8eb17eb /archive-tar.c
parent82a46af13eeed4b73a077b50edb90f559460267f (diff)
downloadgit-17e9ef00d29b349727e3c710869217a36ad08224.zip
git-17e9ef00d29b349727e3c710869217a36ad08224.tar.gz
git-17e9ef00d29b349727e3c710869217a36ad08224.tar.bz2
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>
Diffstat (limited to 'archive-tar.c')
-rw-r--r--archive-tar.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/archive-tar.c b/archive-tar.c
index 3d76977..29ca216 100644
--- 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,
- const char *value, unsigned int valuelen)
+ const char *value, size_t valuelen)
{
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;
@@ -153,14 +153,14 @@ static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
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)
- warning("pax extended header length miscalculated as %d"
+ warning("pax extended header length miscalculated as %"PRIuMAX
", should be %"PRIuMAX,
- len, (uintmax_t)(sb->len - orig_len));
+ (uintmax_t)len, (uintmax_t)(sb->len - orig_len));
}
/*