aboutsummaryrefslogtreecommitdiff
path: root/strbuf.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-27 12:21:43 -0700
committerJunio C Hamano <gitster@pobox.com>2015-07-27 12:21:43 -0700
commit3b175fb940ba970a840cbef3e1e354163838d0eb (patch)
tree819a9bfbb64b75868e6f0f194303db7535dcaff7 /strbuf.h
parent6f402a93ce1eb00438c5bcc5f28164d9165ba8b9 (diff)
parent6c8afe495b2cb6e2069942d7c006f6660e186690 (diff)
downloadgit-3b175fb940ba970a840cbef3e1e354163838d0eb.tar.gz
git-3b175fb940ba970a840cbef3e1e354163838d0eb.tar.xz
Merge branch 'mh/strbuf-read-file-returns-ssize-t' into maint
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.h')
-rw-r--r--strbuf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/strbuf.h b/strbuf.h
index 1883494ca..1ea9d0bde 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -364,7 +364,7 @@ extern ssize_t strbuf_read(struct strbuf *, int fd, size_t hint);
* Read the contents of a file, specified by its path. The third argument
* can be used to give a hint about the file size, to avoid reallocs.
*/
-extern int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
+extern ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);
/**
* Read the target of a symbolic link, specified by its path. The third