From: Alex Richardson <arichardson@FreeBSD.org>
Date: Mon, 8 Aug 2022 20:38:31 +0000 (+0000)
Subject: test-utils-glibc.c: Fix -Werror,-Wmissing-noreturn on FreeBSD
X-Git-Tag: dbus-1.15.0~14^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aec2ad7efbb2bae20808878790462b92d1f87d4d;p=thirdparty%2Fdbus.git

test-utils-glibc.c: Fix -Werror,-Wmissing-noreturn on FreeBSD

Add a conditional _DBUS_GNUC_NORETURN to avoid
`error: function 'back_to_root' could be declared with attribute 'noreturn'`
---

diff --git a/test/test-utils-glib.c b/test/test-utils-glib.c
index c6383af55..d0f7cdc0b 100644
--- a/test/test-utils-glib.c
+++ b/test/test-utils-glib.c
@@ -553,16 +553,20 @@ become_other_user (TestUser user,
 }
 
 /* Undo the effect of a successful call to become_other_user() */
+#if defined(HAVE_GETRESUID) && defined(HAVE_SETRESUID) && defined(__linux__)
 static void
 back_to_root (void)
 {
-#if defined(HAVE_GETRESUID) && defined(HAVE_SETRESUID) && defined(__linux__)
-  if (setresuid (0, 0, 0) != 0)
-    g_error ("setresuid(0, 0, 0): %s", g_strerror (errno));
+  if (setresuid(0, 0, 0) != 0)
+    g_error ("setresuid(0, 0, 0): %s", g_strerror(errno));
+}
 #else
+_DBUS_GNUC_NORETURN static void
+back_to_root (void)
+{
   g_error ("become_other_user() cannot succeed on this platform");
-#endif
 }
+#endif
 
 /*
  * Raise G_IO_ERROR_NOT_SUPPORTED if the requested user is impossible.