summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-06-27 09:56:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-27 09:56:46 -0700
commited319fca3380bd4d68d316f92c5aa777dc785f85 (patch)
treec1fcbdcb4d02916fc68f4e25d830ffb52c919914
parentMerge branch 'dn/gpg-doc' (diff)
parentstrbuf: describe the return value of strbuf_read_file (diff)
downloadtgif-ed319fca3380bd4d68d316f92c5aa777dc785f85.tar.xz
Merge branch 'pb/strbuf-read-file-doc'
* pb/strbuf-read-file-doc: strbuf: describe the return value of strbuf_read_file
-rw-r--r--strbuf.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/strbuf.h b/strbuf.h
index 7987405313..83c5c98530 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -377,6 +377,8 @@ extern ssize_t strbuf_read_once(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.
+ * Return the number of bytes read or a negative value if some error
+ * occurred while opening or reading the file.
*/
extern ssize_t strbuf_read_file(struct strbuf *sb, const char *path, size_t hint);