multipath-tools: miscellaneous code cleanups

io_getevents can return < 0 if it is interrupted, but it doesn't set errno.
This patch sets errno to zero first to avoid printing garbage. Also the
log_thread and uevq_thread functions need to return NULL to avoid compiler
warnings.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>

diff --git a/libmultipath/checkers/directio.c b/libmultipath/checkers/directio.c
index 4728424..44e5eff 100644 (file)
--- a/libmultipath/checkers/directio.c
+++ b/libmultipath/checkers/directio.c
@@ -148,6 +148,7 @@ check_state(int fd, struct directio_context *ct, int sync)
        }
        ct->running++;
 
+       errno = 0;
        r = io_getevents(ct->ioctx, 1L, 1L, &event, &timeout);
 
        if (r < 0 ) {

diff --git a/libmultipath/log_pthread.c b/libmultipath/log_pthread.c
index 838c06e..ed7b200 100644 (file)
--- a/libmultipath/log_pthread.c
+++ b/libmultipath/log_pthread.c
@@ -56,6 +56,7 @@ static void * log_thread (void * et)
 
                flush_logqueue();
        }
+       return NULL;
 }
 
 void log_thread_start (pthread_attr_t *attr)

diff --git a/libmultipath/uevent.c b/libmultipath/uevent.c
index 50ed9c9..f18c20b 100644 (file)
--- a/libmultipath/uevent.c
+++ b/libmultipath/uevent.c
@@ -101,6 +101,7 @@ uevq_thread(void * et)
 
                service_uevq();
        }
+       return NULL;
 }
 
 int uevent_listen(int (*uev_trigger)(struct uevent *, void * trigger_data),