From f80e9bc30a2ae9032790b888abc6ffc8ca90a940 Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Tue, 15 May 2012 10:49:02 +0200 Subject: libuuid: move read_all to include/all-io.h Signed-off-by: Petr Uzel --- libuuid/src/gen_uuid.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'libuuid') diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c index 93d292a22..9d5575b85 100644 --- a/libuuid/src/gen_uuid.c +++ b/libuuid/src/gen_uuid.c @@ -87,6 +87,7 @@ #include #endif +#include "all-io.h" #include "uuidP.h" #include "uuidd.h" #include "randutils.h" @@ -334,31 +335,6 @@ try_again: } #if defined(HAVE_UUIDD) && defined(HAVE_SYS_UN_H) -/* used in get_uuid_via_daemon() only */ -static ssize_t read_all(int fd, char *buf, size_t count) -{ - ssize_t ret; - ssize_t c = 0; - int tries = 0; - - memset(buf, 0, count); - while (count > 0) { - ret = read(fd, buf, count); - if (ret <= 0) { - if ((errno == EAGAIN || errno == EINTR || ret == 0) && - (tries++ < 5)) - continue; - return c ? c : -1; - } - if (ret > 0) - tries = 0; - count -= ret; - buf += ret; - c += ret; - } - return c; -} - /* * Try using the uuidd daemon to generate the UUID * -- cgit v1.2.3-55-g7522