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

diff --git a/strbuf.c b/strbuf.c
index 0d4f4e54ec1ff1f0d37155e8049476d802a7c7e5..bbaf32eef6b0b36ea52390be3aee2ffab7f24f13 100644 (file)
--- 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)

diff --git a/strbuf.h b/strbuf.h
index 01c5c6371b8e43686f335704a67a59a1d82dbe3b..4a48c0031a7c0df6a7efdb2151d5701dd256fa28 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -365,7 +365,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