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>
René Scharfe committed
Aug 17, 2019 at 18:24 UTC
17e9ef00d29b349727e3c710869217a36ad08224
1 file changed
+5
-5
archive-tar.c
+5
-5
@@ -142,10 +142,10 @@ static int stream_blocked(const struct object_id *oid)
142
* string and appends it to a struct strbuf.
143
*/
144
static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
145
- const char *value, unsigned int valuelen)
145
+ const char *value, size_t valuelen)
146
{
147
size_t orig_len = sb->len;
148
- int len, tmp;
148
+ size_t len, tmp;
149
150
/* "%u %s=%s\n" */
151
len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1;
@@ -153,14 +153,14 @@ static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
153
len++;
154
155
strbuf_grow(sb, len);
156
- strbuf_addf(sb, "%u %s=", len, keyword);
156
+ strbuf_addf(sb, "%"PRIuMAX" %s=", (uintmax_t)len, keyword);
157
strbuf_add(sb, value, valuelen);
158
strbuf_addch(sb, '\n');
159
160
if (len != sb->len - orig_len)
161
- warning("pax extended header length miscalculated as %d"
161
+ warning("pax extended header length miscalculated as %"PRIuMAX
162
", should be %"PRIuMAX,
163
- len, (uintmax_t)(sb->len - orig_len));
163
+ (uintmax_t)len, (uintmax_t)(sb->len - orig_len));
164
}
165
166
/*