use G_GNUC_NORETURN instead of ATTRIBUTE_NORETURN

Remove all usage of ATTRIBUTE_NORETURN in favor of GLib's
G_GNUC_NORETURN.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 905645a41c39c6a1fe441ce0b2e188670a3aa58f..97f9055506d22cbf0b0a49ba06499b208c570cd9 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -116,7 +116,7 @@ static int lxcContainerMountFSBlock(virDomainFSDefPtr fs,
  * in a child pid namespace if container reboot support exists.
  * Otherwise, it will either succeed or return -EPERM.
  */
-ATTRIBUTE_NORETURN static int
+G_GNUC_NORETURN static int
 lxcContainerRebootChild(void *argv)
 {
     int *cmd = argv;

diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
index 46482ad3ceed1cd3f5910dc2e4036b19cb37fd77..dc737879ca1dbd76f3f07663264709a0e9e9653e 100644 (file)
--- a/src/network/leaseshelper.c
+++ b/src/network/leaseshelper.c
@@ -47,7 +47,7 @@ helperVersion(const char *argv0)
     printf("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION);
 }
 
-ATTRIBUTE_NORETURN static void
+G_GNUC_NORETURN static void
 usage(int status)
 {
     if (status) {

diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index f3d45b9c03f330b59cce110bfb7f053938d70263..3dc0488b26e9ee247305304c4dd80933d2575052 100644 (file)
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -175,7 +175,7 @@ runIO(const char *path, int fd, int oflags)
 
 static const char *program_name;
 
-ATTRIBUTE_NORETURN static void
+G_GNUC_NORETURN static void
 usage(int status)
 {
     if (status) {

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index b1544af7309103977fb1a03aea308ef17f247fb5..0fa648ce74bf8ee6b011e9f8abf0cf7d3301befa 100644 (file)
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -1214,7 +1214,7 @@ virProcessSetupPrivateMountNS(void)
 #endif /* !defined(HAVE_SYS_MOUNT_H) || !defined(HAVE_UNSHARE) */
 
 #if defined(__linux__)
-ATTRIBUTE_NORETURN static int
+G_GNUC_NORETURN static int
 virProcessDummyChild(void *argv ATTRIBUTE_UNUSED)
 {
     _exit(0);

diff --git a/src/util/virprocess.h b/src/util/virprocess.h
index 4806c592da7bbf9f6bbc9aa7c1b75a0b39c03867..8e2af33c7df7d77e74f1653093f6e7888fb31ef8 100644 (file)
--- a/src/util/virprocess.h
+++ b/src/util/virprocess.h
@@ -46,7 +46,7 @@ virProcessTranslateStatus(int status);
 void
 virProcessAbort(pid_t pid);
 
-void virProcessExitWithStatus(int status) ATTRIBUTE_NORETURN;
+void virProcessExitWithStatus(int status) G_GNUC_NORETURN;
 
 int
 virProcessWait(pid_t pid, int *exitstatus, bool raw)

diff --git a/tests/eventtest.c b/tests/eventtest.c
index f04b416ad25c9a41e59070e335be43a5492d8ab8..2a6edc746185e8b0d5d222a580079b0c3b604210 100644 (file)
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -158,7 +158,7 @@ static pthread_cond_t eventThreadJobCond = PTHREAD_COND_INITIALIZER;
 static int eventThreadJobDone;
 
 
-ATTRIBUTE_NORETURN static void *eventThreadLoop(void *data ATTRIBUTE_UNUSED) {
+G_GNUC_NORETURN static void *eventThreadLoop(void *data ATTRIBUTE_UNUSED) {
     while (1) {
         pthread_mutex_lock(&eventThreadMutex);
         while (!eventThreadRunOnce)