Merge branch 'mh/strbuf-read-file-returns-ssize-t'

Avoid possible ssize_t to int truncation.

* mh/strbuf-read-file-returns-ssize-t:
  strbuf: strbuf_read_file() should return ssize_t
This commit is contained in:
Junio C Hamano
2015-07-13 14:00:27 -07:00
2 changed files with 4 additions and 3 deletions

View File

@ -526,9 +526,10 @@ int strbuf_getwholeline_fd(struct strbuf *sb, int fd, int term)
return 0;
}
int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint)
ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint)
{
int fd, len;
int fd;
ssize_t len;
fd = open(path, O_RDONLY);
if (fd < 0)