summaryrefslogtreecommitdiff
path: root/strbuf.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-13 21:00:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-13 21:00:27 (GMT)
commitd790ba92cc534127fc4c0d58a901d1553835aa62 (patch)
tree3facd1640b2c5f11994a00400c1a641c10753f0a /strbuf.c
parent6cf7eef384968e9886e9d2eba440974c66908aa6 (diff)
parent6c8afe495b2cb6e2069942d7c006f6660e186690 (diff)
downloadgit-d790ba92cc534127fc4c0d58a901d1553835aa62.zip
git-d790ba92cc534127fc4c0d58a901d1553835aa62.tar.gz
git-d790ba92cc534127fc4c0d58a901d1553835aa62.tar.bz2
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
Diffstat (limited to 'strbuf.c')
-rw-r--r--strbuf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/strbuf.c b/strbuf.c
index 0d4f4e5..bbaf32e 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -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)