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

Merge branch 'jk/size-t'

Browse Source 
Code clean-up to use size_t/ssize_t when they are the right type.

* jk/size-t:
  strbuf_humanise: use unsigned variables
  pass st.st_size as hint for strbuf_readlink()
  strbuf_readlink: use ssize_t
  strbuf: use size_t for length in intermediate variables
  reencode_string: use size_t for string lengths
  reencode_string: use st_add/st_mult helpers
This commit is contained in:
Junio C Hamano
2018-08-15 15:08:25 -07:00
parent bce8031d9a 7726d360b5
commit 7d020f5a78
7 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utf8.c
View File

@ -470,14 +470,14 @@ int utf8_fprintf(FILE *stream, const char *format, ...)
#else
typedef char * iconv_ibp;
#endif
char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv, int *outsz_p)
char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv, size_t *outsz_p)
{
size_t outsz, outalloc;
char *out, *outpos;
iconv_ibp cp;
outsz = insz;
outalloc = outsz + 1; /* for terminating NUL */
outalloc = st_add(outsz, 1); /* for terminating NUL */
out = xmalloc(outalloc);
outpos = out;
cp = (iconv_ibp)in;
@ -497,7 +497,7 @@ char *reencode_string_iconv(const char *in, size_t insz, iconv_t conv, int *outs
* converting the rest.
*/
sofar = outpos - out;
outalloc = sofar + insz * 2 + 32;
outalloc = st_add3(sofar, st_mult(insz, 2), 32);
out = xrealloc(out, outalloc);
outpos = out + sofar;
outsz = outalloc - sofar - 1;
@ -534,9 +534,9 @@ static const char *fallback_encoding(const char *name)
return name;
}
char *reencode_string_len(const char *in, int insz,
char *reencode_string_len(const char *in, size_t insz,
const char *out_encoding, const char *in_encoding,
int *outsz)
size_t *outsz)
{
iconv_t conv;
char *out;