mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

archive-tar: use size_t in strbuf_append_ext_header()

Browse Source 
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>
This commit is contained in:
René Scharfe
2019-08-17 18:24:13 +02:00
committed by Junio C Hamano
parent 82a46af13e
commit 17e9ef00d2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
archive-tar.c
View File

@ -142,10 +142,10 @@ static int stream_blocked(const struct object_id *oid)
* string and appends it to a struct strbuf. * string and appends it to a struct strbuf.
*/ */
static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword, 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" */ /* "%u %s=%s\n" */
len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1; 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++; len++;
strbuf_grow(sb, 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_add(sb, value, valuelen);
strbuf_addch(sb, '\n'); strbuf_addch(sb, '\n');
if (len != sb->len - orig_len) 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));
} }
/* /*