mirror of
https://github.com/git/git.git
synced 2024-06-09 02:26:11 +02:00
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:
commit
d790ba92cc
5
strbuf.c
5
strbuf.c
|
@ -526,9 +526,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
2
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
|
* 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
|
||||||
|
|
Loading…
Reference in New Issue