From 1c15afb9343bca82e687d008ec983a9110ac9c40 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 19 Dec 2005 16:18:28 -0800 Subject: xread/xwrite: do not worry about EINTR at calling sites. We had errno==EINTR check after read(2)/write(2) sprinkled all over the places, always doing continue. Consolidate them into xread()/xwrite() wrapper routines. Credits for suggestion goes to HPA -- bugs are mine. Signed-off-by: Junio C Hamano --- csum-file.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'csum-file.c') diff --git a/csum-file.c b/csum-file.c index c66b9eb10b..5f9249aeed 100644 --- a/csum-file.c +++ b/csum-file.c @@ -15,7 +15,7 @@ static int sha1flush(struct sha1file *f, unsigned int count) void *buf = f->buffer; for (;;) { - int ret = write(f->fd, buf, count); + int ret = xwrite(f->fd, buf, count); if (ret > 0) { buf += ret; count -= ret; @@ -25,8 +25,6 @@ static int sha1flush(struct sha1file *f, unsigned int count) } if (!ret) die("sha1 file '%s' write error. Out of diskspace", f->name); - if (errno == EAGAIN || errno == EINTR) - continue; die("sha1 file '%s' write error (%s)", f->name, strerror(errno)); } } -- cgit v1.2.3