mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 04:16:10 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2015-07-13 14:00:27 -07:00
parent 6cf7eef384 6c8afe495b
commit d790ba92cc
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

@ -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)

2
strbuf.h
View File

@ -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