diff options
| author |  Jeff King <peff@peff.net> | 2018-07-24 06:50:33 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-24 10:19:29 -0700 |
| commit | c7d017d7e1cca37ca20f73c11fa9f1b319a2c3a5 (patch) | |
| tree | 41b17395ddd01ae0436d78b906578f7b4861c054 /convert.c | |
| parent | reencode_string: use st_add/st_mult helpers (diff) | |
| download | tgif-c7d017d7e1cca37ca20f73c11fa9f1b319a2c3a5.tar.xz | |
reencode_string: use size_t for string lengths
The iconv interface takes a size_t, which is the appropriate
type for an in-memory buffer. But our reencode_string_*
functions use integers, meaning we may get confusing results
when the sizes exceed INT_MAX. Let's use size_t
consistently.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'convert.c')
| -rw-r--r-- | convert.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -389,7 +389,7 @@ static int encode_to_git(const char *path, const char *src, size_t src_len, struct strbuf *buf, const char *enc, int conv_flags) { char *dst; - int dst_len; + size_t dst_len; int die_on_error = conv_flags & CONV_WRITE_OBJECT; /* @@ -452,7 +452,7 @@ static int encode_to_git(const char *path, const char *src, size_t src_len, */ if (die_on_error && check_roundtrip(enc)) { char *re_src; - int re_src_len; + size_t re_src_len; re_src = reencode_string_len(dst, dst_len, enc, default_encoding, @@ -480,7 +480,7 @@ static int encode_to_worktree(const char *path, const char *src, size_t src_len, struct strbuf *buf, const char *enc) { char *dst; - int dst_len; + size_t dst_len; /* * No encoding is specified or there is nothing to encode. |