Browse Source

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

Avoid possible ssize_t to int truncation.

* mh/strbuf-read-file-returns-ssize-t:
  strbuf: strbuf_read_file() should return ssize_t
maint
Junio C Hamano 9 years ago
parent
commit
3b175fb940
  1. 5
      strbuf.c
  2. 2
      strbuf.h

5
strbuf.c

@ -481,9 +481,10 @@ int strbuf_getwholeline_fd(struct strbuf *sb, int fd, int term) @@ -481,9 +481,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

@ -364,7 +364,7 @@ extern ssize_t strbuf_read(struct strbuf *, int fd, size_t hint); @@ -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
* 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

Loading…
Cancel
Save