undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/strbuf-read-file-returns-ssize-t' into maint

Browse Source 
Avoid possible ssize_t to int truncation.

* mh/strbuf-read-file-returns-ssize-t:
  strbuf: strbuf_read_file() should return ssize_t
This commit is contained in:
Junio C Hamano 2015-07-27 12:21:43 -07:00
commit 3b175fb940
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
strbuf.c
View File

@ -481,9 +481,10 @@ int strbuf_getwholeline_fd(struct strbuf *sb, int fd, int term)
return 0; 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); fd = open(path, O_RDONLY);
if (fd < 0) if (fd < 0)

2
strbuf.h
View File

@ -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 * 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. * 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 * Read the target of a symbolic link, specified by its path. The third