# [PATCH] wrapper.c: simplify xread() and xwrite() 1 messages from 2010-04-04 to 2010-04-04. Participants: Tony Finch. Thread: https://gitlist.dev/t/23333 ## Tony Finch, 2010-04-04 22:06 Subject: [PATCH] wrapper.c: simplify xread() and xwrite() Message-ID: URL: https://gitlist.dev/e/E1NyXy7-0005j7-14%40hermes-2.csi.cam.ac.uk ``` do/while is more straightforward than while(1)/if/continue/return. Signed-off-by: Tony Finch --- wrapper.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/wrapper.c b/wrapper.c index 9c71b21..f34f492 100644 --- a/wrapper.c +++ b/wrapper.c @@ -116,12 +116,10 @@ void *xmmap(void *start, size_t length, ssize_t xread(int fd, void *buf, size_t len) { ssize_t nr; - while (1) { + do { nr = read(fd, buf, len); - if ((nr < 0) && (errno == EAGAIN || errno == EINTR)) - continue; - return nr; - } + } while ((nr < 0) && (errno == EAGAIN || errno == EINTR)); + return nr; } /* @@ -132,12 +130,10 @@ ssize_t xread(int fd, void *buf, size_t len) ssize_t xwrite(int fd, const void *buf, size_t len) { ssize_t nr; - while (1) { + do { nr = write(fd, buf, len); - if ((nr < 0) && (errno == EAGAIN || errno == EINTR)) - continue; - return nr; - } + } while ((nr < 0) && (errno == EAGAIN || errno == EINTR)); + return nr; } ssize_t read_in_full(int fd, void *buf, size_t count) -- 1.6.2.1 ```