summaryrefslogtreecommitdiff
path: root/pkt-line.c
diff options
context:
space:
mode:
authorHeikki Orsila <heikki.orsila@iki.fi>2008-05-03 13:27:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-04 05:15:25 (GMT)
commitc697ad143ba1ff58b29e7efe149d244d4b7010a5 (patch)
tree7d3446a01ad6e3f37dd318e0e29d57da21024366 /pkt-line.c
parent471793f91e4bd61bb809045c7088a30ee1305a19 (diff)
downloadgit-c697ad143ba1ff58b29e7efe149d244d4b7010a5.zip
git-c697ad143ba1ff58b29e7efe149d244d4b7010a5.tar.gz
git-c697ad143ba1ff58b29e7efe149d244d4b7010a5.tar.bz2
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>
Diffstat (limited to 'pkt-line.c')
-rw-r--r--pkt-line.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/pkt-line.c b/pkt-line.c
index 355546a..f5d0086 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)