Fix warnings from compiler option '-Wsuggest-attribute=noreturn'

This patch fixes warnings from '-Wsuggest-attribute=noreturn'. We cannot
enable it unconditionally as it would break libtool.

Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>

diff --git a/dbus/dbus-message-internal.h b/dbus/dbus-message-internal.h
index 4bb4d8b..00259bf 100644 (file)
--- a/dbus/dbus-message-internal.h
+++ b/dbus/dbus-message-internal.h
@@ -78,14 +78,18 @@ DBUS_PRIVATE_EXPORT
 void               _dbus_message_loader_return_buffer         (DBusMessageLoader  *loader,
                                                                DBusString         *buffer);
 
+
+#ifdef HAVE_UNIX_FD_PASSING
 DBUS_PRIVATE_EXPORT
 dbus_bool_t        _dbus_message_loader_get_unix_fds          (DBusMessageLoader  *loader,
                                                                int               **fds,
                                                                unsigned           *max_n_fds);
+
 DBUS_PRIVATE_EXPORT
 void               _dbus_message_loader_return_unix_fds       (DBusMessageLoader  *loader,
                                                                int                *fds,
                                                                unsigned            n_fds);
+#endif
 
 DBUS_PRIVATE_EXPORT
 dbus_bool_t        _dbus_message_loader_queue_messages        (DBusMessageLoader  *loader);

diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index d4f175f..da3bb9d 100644 (file)
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -4065,6 +4065,7 @@ _dbus_message_loader_return_buffer (DBusMessageLoader  *loader,
   loader->buffer_outstanding = FALSE;
 }
 
+#ifdef HAVE_UNIX_FD_PASSING
 /**
  * Gets the buffer to use for reading unix fds from the network.
  *
@@ -4080,7 +4081,6 @@ _dbus_message_loader_get_unix_fds(DBusMessageLoader  *loader,
                                   int               **fds,
                                   unsigned           *max_n_fds)
 {
-#ifdef HAVE_UNIX_FD_PASSING
   _dbus_assert (!loader->unix_fds_outstanding);
 
   /* Allocate space where we can put the fds we read. We allocate
@@ -4108,10 +4108,6 @@ _dbus_message_loader_get_unix_fds(DBusMessageLoader  *loader,
 
   loader->unix_fds_outstanding = TRUE;
   return TRUE;
-#else
-  _dbus_assert_not_reached("Platform doesn't support unix fd passing");
-  return FALSE;
-#endif
 }
 
 /**
@@ -4129,7 +4125,6 @@ _dbus_message_loader_return_unix_fds(DBusMessageLoader  *loader,
                                      int                *fds,
                                      unsigned            n_fds)
 {
-#ifdef HAVE_UNIX_FD_PASSING
   _dbus_assert(loader->unix_fds_outstanding);
   _dbus_assert(loader->unix_fds + loader->n_unix_fds == fds);
   _dbus_assert(loader->n_unix_fds + n_fds <= loader->n_unix_fds_allocated);
@@ -4139,10 +4134,8 @@ _dbus_message_loader_return_unix_fds(DBusMessageLoader  *loader,
 
   if (n_fds && loader->unix_fds_change)
     loader->unix_fds_change (loader->unix_fds_change_data);
-#else
-  _dbus_assert_not_reached("Platform doesn't support unix fd passing");
-#endif
 }
+#endif
 
 /*
  * FIXME when we move the header out of the buffer, that memmoves all

diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 5a01981..4c872c3 100644 (file)
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -609,7 +609,7 @@ kill_bus_when_session_ends (void)
     }
 }
 
-static void
+_DBUS_GNUC_NORETURN static void
 babysit (int   exit_with_session,
          pid_t child_pid,
          int   read_bus_pid_fd)  /* read pid from here */

diff --git a/tools/dbus-launch.h b/tools/dbus-launch.h
index d0ede6b..5382787 100644 (file)
--- a/tools/dbus-launch.h
+++ b/tools/dbus-launch.h
@@ -44,7 +44,7 @@
 /* defined in dbus-launch.c */
 void verbose (const char *format, ...);
 char *xstrdup (const char *str);
-void kill_bus_and_exit (int exitcode);
+void kill_bus_and_exit (int exitcode) _DBUS_GNUC_NORETURN;
 
 const char* get_machine_uuid (void);