Commit 8a912bcb authored by Johan Herland's avatar Johan Herland Committed by Junio C Hamano

Ensure return value from xread() is always stored into an ssize_t

This patch fixes all calls to xread() where the return value is not
stored into an ssize_t. The patch should not have any effect whatsoever,
other than putting better/more appropriate type names on variables.
Signed-off-by: default avatarJohan Herland <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 2924415f
......@@ -185,7 +185,7 @@ static void *read_patch_file(int fd, unsigned long *sizep)
void *buffer = xmalloc(alloc);
for (;;) {
int nr = alloc - size;
ssize_t nr = alloc - size;
if (nr < 1024) {
alloc += CHUNKSIZE;
buffer = xrealloc(buffer, alloc);
......@@ -1468,7 +1468,7 @@ static int read_old_data(struct stat *st, const char *path, char **buf_p, unsign
return error("unable to open %s", path);
got = 0;
for (;;) {
int ret = xread(fd, buf + got, size - got);
ssize_t ret = xread(fd, buf + got, size - got);
if (ret <= 0)
break;
got += ret;
......
......@@ -48,7 +48,7 @@ static int read_string(int fd, char *buffer, int size)
{
int i;
for (i = 0; i < size - 1; i++) {
int count = xread(fd, buffer + i, 1);
ssize_t count = xread(fd, buffer + i, 1);
if (count < 0)
return error("Read error: %s", strerror(errno));
if (count == 0) {
......
......@@ -6,11 +6,11 @@
static char *get_stdin(void)
{
int offset = 0;
size_t offset = 0;
char *data = xmalloc(CHUNK_SIZE);
while (1) {
int cnt = xread(0, data + offset, CHUNK_SIZE);
ssize_t cnt = xread(0, data + offset, CHUNK_SIZE);
if (cnt < 0)
die("error reading standard input: %s",
strerror(errno));
......
......@@ -34,7 +34,7 @@ static void *fill(int min)
offset = 0;
}
do {
int ret = xread(0, buffer + len, sizeof(buffer) - len);
ssize_t ret = xread(0, buffer + len, sizeof(buffer) - len);
if (ret <= 0) {
if (!ret)
die("early EOF");
......
......@@ -714,7 +714,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
result_size = len;
result = xmalloc(len + 1);
while (sz < len) {
int done = xread(fd, result+sz, len-sz);
ssize_t done = xread(fd, result+sz, len-sz);
if (done == 0)
break;
if (done < 0)
......
......@@ -3,10 +3,9 @@
int copy_fd(int ifd, int ofd)
{
while (1) {
int len;
char buffer[8192];
char *buf = buffer;
len = xread(ifd, buffer, sizeof(buffer));
ssize_t len = xread(ifd, buffer, sizeof(buffer));
if (!len)
break;
if (len < 0) {
......
......@@ -1411,7 +1411,7 @@ static int populate_from_stdin(struct diff_filespec *s)
#define INCREMENT 1024
char *buf;
unsigned long size;
int got;
ssize_t got;
size = 0;
buf = NULL;
......
......@@ -224,7 +224,7 @@ socket_perror( const char *func, Socket_t *sock, int ret )
static int
socket_read( Socket_t *sock, char *buf, int len )
{
int n = xread( sock->fd, buf, len );
ssize_t n = xread( sock->fd, buf, len );
if (n <= 0) {
socket_perror( "read", sock, n );
close( sock->fd );
......
......@@ -82,7 +82,7 @@ static void *fill(int min)
die("cannot fill %d bytes", min);
flush();
do {
int ret = xread(input_fd, input_buffer + input_len,
ssize_t ret = xread(input_fd, input_buffer + input_len,
sizeof(input_buffer) - input_len);
if (ret <= 0) {
if (!ret)
......
......@@ -65,10 +65,10 @@ void packet_write(int fd, const char *fmt, ...)
static void safe_read(int fd, void *buffer, unsigned size)
{
int n = 0;
size_t n = 0;
while (n < size) {
int ret = xread(fd, (char *) buffer + n, size - n);
ssize_t ret = xread(fd, (char *) buffer + n, size - n);
if (ret < 0)
die("read error (%s)", strerror(errno));
if (!ret)
......
......@@ -2276,7 +2276,7 @@ int read_pipe(int fd, char** return_buf, unsigned long* return_size)
{
char* buf = *return_buf;
unsigned long size = *return_size;
int iret;
ssize_t iret;
unsigned long off = 0;
do {
......
......@@ -86,7 +86,7 @@ static int serve_ref(int fd_in, int fd_out)
static void service(int fd_in, int fd_out) {
char type;
int retval;
ssize_t retval;
do {
retval = xread(fd_in, &type, 1);
if (retval < 1) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment