From c697ad143ba1ff58b29e7efe149d244d4b7010a5 Mon Sep 17 00:00:00 2001 From: Heikki Orsila Date: Sat, 3 May 2008 16:27:26 +0300 Subject: Cleanup xread() loops to use read_in_full() Signed-off-by: Heikki Orsila Signed-off-by: Junio C Hamano --- pkt-line.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'pkt-line.c') diff --git a/pkt-line.c b/pkt-line.c index 355546a1a..f5d00863a 100644 --- a/pkt-line.c +++ b/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) -- cgit v1.2.1