Enable use of -Wmissing-noreturn

* src/internal.h: Define a ATTRIBUTE_NO_RETURN annotation
* src/lxc/lxc_container.c: Annotate lxcContainerDummyChild
  with ATTRIBUTE_NO_RETURN
* tests/eventtest.c: Mark async thread as ATTRIBUTE_NO_RETURN
* m4/virt-compile-warnings.m4: Enable -Wmissing-noreturn

diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
index 0431074cb6ed626727c9f76ce35d3f3e9b03a47e..27413b09f233beef9bffa78445f9320422dbdfbc 100644 (file)
--- a/m4/virt-compile-warnings.m4
+++ b/m4/virt-compile-warnings.m4
@@ -63,7 +63,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
         dontwarn="$dontwarn -Wconversion"
         dontwarn="$dontwarn -Wsign-conversion"
         dontwarn="$dontwarn -Wold-style-definition"
-        dontwarn="$dontwarn -Wmissing-noreturn"
         dontwarn="$dontwarn -Wpacked"
         dontwarn="$dontwarn -Wunused-macros"
         dontwarn="$dontwarn -Woverlength-strings"

diff --git a/src/internal.h b/src/internal.h
index 2afbd8db427b6aa91abf3d5b63ffe616e6ad9521..4641fc154015af5cb5c0012762f55842e5e14911 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -116,6 +116,15 @@
 #   define ATTRIBUTE_UNUSED __attribute__((__unused__))
 #  endif
 
+/**
+ * ATTRIBUTE_NORETURN:
+ *
+ * Macro to indicate that a function won't return to the caller
+ */
+#  ifndef ATTRIBUTE_NORETURN
+#   define ATTRIBUTE_NORETURN __attribute__((__noreturn__))
+#  endif
+
 /**
  * ATTRIBUTE_SENTINEL:
  *

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 9830b71c2a4f3a61115ab26b391a9a764b19ce6e..af453f34461d8ccfc66d29206690bfc3a5327257 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -914,7 +914,8 @@ int lxcContainerStart(virDomainDefPtr def,
     return pid;
 }
 
-static int lxcContainerDummyChild(void *argv ATTRIBUTE_UNUSED)
+ATTRIBUTE_NORETURN static int
+lxcContainerDummyChild(void *argv ATTRIBUTE_UNUSED)
 {
     _exit(0);
 }

diff --git a/tests/eventtest.c b/tests/eventtest.c
index 4d22070c70def585b8e9d2fc39b8ecdf73de7c78..eb4b7552a915ab8c386f08c2ead7843f3db6e358 100644 (file)
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -119,7 +119,7 @@ static pthread_cond_t eventThreadJobCond = PTHREAD_COND_INITIALIZER;
 static int eventThreadJobDone = 0;
 
 
-static void *eventThreadLoop(void *data ATTRIBUTE_UNUSED) {
+ATTRIBUTE_NORETURN static void *eventThreadLoop(void *data ATTRIBUTE_UNUSED) {
     while (1) {
         pthread_mutex_lock(&eventThreadMutex);
         while (!eventThreadRunOnce) {
@@ -135,7 +135,6 @@ static void *eventThreadLoop(void *data ATTRIBUTE_UNUSED) {
         pthread_cond_signal(&eventThreadJobCond);
         pthread_mutex_unlock(&eventThreadMutex);
     }
-    return NULL;
 }