Cleanup xread() loops to use read_in_full()
Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
471793f91e
commit
c697ad143b
15
pkt-line.c
15
pkt-line.c
@ -65,16 +65,11 @@ void packet_write(int fd, const char *fmt, ...)
|
||||
|
||||
static void safe_read(int fd, void *buffer, unsigned size)
|
||||
{
|
||||
size_t n = 0;
|
||||
|
||||
while (n < size) {
|
||||
ssize_t ret = xread(fd, (char *) buffer + n, size - n);
|
||||
if (ret < 0)
|
||||
die("read error (%s)", strerror(errno));
|
||||
if (!ret)
|
||||
die("The remote end hung up unexpectedly");
|
||||
n += ret;
|
||||
}
|
||||
ssize_t ret = read_in_full(fd, buffer, size);
|
||||
if (ret < 0)
|
||||
die("read error (%s)", strerror(errno));
|
||||
else if (ret < size)
|
||||
die("The remote end hung up unexpectedly");
|
||||
}
|
||||
|
||||
int packet_read_line(int fd, char *buffer, unsigned size)
|
||||
|
||||
Reference in New Issue
Block a user