From ccea25f1c7cd3f0b12d878a5294620f5478729f8 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Thu, 30 Oct 2014 17:37:16 +0300 Subject: os-posix: replace goto again with a proper loop Eliminiate two fullwrite implementations with goto replacing them with a proper do..while loop. Signed-off-by: Michael Tokarev Reviewed-by: Gonglei --- os-posix.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/os-posix.c b/os-posix.c index d687896f91..eada8d4685 100644 --- a/os-posix.c +++ b/os-posix.c @@ -218,11 +218,9 @@ void os_daemonize(void) close(fds[1]); - again: - len = read(fds[0], &status, 1); - if (len == -1 && (errno == EINTR)) { - goto again; - } + do { + len = read(fds[0], &status, 1); + } while (len < 0 && errno == EINTR); if (len != 1) { exit(1); } @@ -264,11 +262,9 @@ void os_setup_post(void) uint8_t status = 0; ssize_t len; - again1: - len = write(daemon_pipe, &status, 1); - if (len == -1 && (errno == EINTR)) { - goto again1; - } + do { + len = write(daemon_pipe, &status, 1); + } while (len < 0 && errno == EINTR); if (len != 1) { exit(1); } -- cgit v1.2.3