diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-07-03 15:59:32 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-07-03 18:25:02 -0700 |
commit | 6c8afe495b2cb6e2069942d7c006f6660e186690 (patch) | |
tree | 005b10770005c0d15a7cb6272425031e9510356a | |
parent | Merge branch 'jk/stash-require-clean-index' into maint (diff) | |
download | tgif-6c8afe495b2cb6e2069942d7c006f6660e186690.tar.xz |
strbuf: strbuf_read_file() should return ssize_t
It is currently declared to return int, which could overflow for
large files.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | strbuf.c | 5 | ||||
-rw-r--r-- | strbuf.h | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -481,9 +481,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) @@ -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 |