From 8d6cba834ec0a3c5c185c486c0921b0fec8ae7da Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Sun, 21 Aug 2016 21:12:04 +0200 Subject: 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 --- dbus/dbus-message-internal.h | 4 ++++ dbus/dbus-message.c | 11 ++--------- tools/dbus-launch.c | 2 +- tools/dbus-launch.h | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dbus/dbus-message-internal.h b/dbus/dbus-message-internal.h index 4bb4d8b..00259bf 100644 --- 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 547f248..b61c06d 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -4061,6 +4061,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. * @@ -4076,7 +4077,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 @@ -4104,10 +4104,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 } /** @@ -4125,7 +4121,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); @@ -4135,10 +4130,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 --- 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 --- 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); -- 2.7.4