From c6a4bdb9ea086ba48b000777f35090559f86c962 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 13 Feb 2011 21:48:26 +0100 Subject: local: don't override initial return value The return initial value is overriden after the initial read. Don't override this value, instead we check the return value of the read() operation. This patch also changes the error statistics accounting since we consider that a request with no data is an error. Signed-off-by: Pablo Neira Ayuso --- src/run.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/run.c b/src/run.c index 5781939..d96ff6c 100644 --- a/src/run.c +++ b/src/run.c @@ -191,14 +191,10 @@ static int local_handler(int fd, void *data) int ret = LOCAL_RET_OK; int type; - ret = read(fd, &type, sizeof(type)); - if (ret == -1) { + if (read(fd, &type, sizeof(type)) <= 0) { STATE(stats).local_read_failed++; return LOCAL_RET_OK; } - if (ret == 0) - return LOCAL_RET_OK; - switch(type) { case FLUSH_MASTER: STATE(stats).nl_kernel_table_flush++; -- cgit v1.2.3