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

6
convert.c
View File

@ -390,7 +390,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;
/*
@ -453,7 +453,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,
@ -481,7 +481,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.