From b5f1ea4bb1070f1fbf6fc5170136254192c9bff0 Mon Sep 17 00:00:00 2001 From: Brian Cameron Date: Wed, 17 Aug 2011 03:01:14 -0500 Subject: [PATCH] void functions should not return. Fixes bug #656675. --- gio/gdbusconnection.c | 4 ++-- gio/gdbusmethodinvocation.c | 4 ++-- gio/gdbusproxy.c | 4 ++-- gio/gtlsdatabase.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c index 978ad6aa7..098b915a3 100644 --- a/gio/gdbusconnection.c +++ b/gio/gdbusconnection.c @@ -5349,7 +5349,7 @@ g_dbus_connection_call (GDBusConnection *connection, GAsyncReadyCallback callback, gpointer user_data) { - return g_dbus_connection_call_internal (connection, bus_name, object_path, interface_name, method_name, parameters, reply_type, flags, timeout_msec, NULL, cancellable, callback, user_data); + g_dbus_connection_call_internal (connection, bus_name, object_path, interface_name, method_name, parameters, reply_type, flags, timeout_msec, NULL, cancellable, callback, user_data); } /** @@ -5493,7 +5493,7 @@ g_dbus_connection_call_with_unix_fd_list (GDBusConnection *connection, GAsyncReadyCallback callback, gpointer user_data) { - return g_dbus_connection_call_internal (connection, bus_name, object_path, interface_name, method_name, parameters, reply_type, flags, timeout_msec, fd_list, cancellable, callback, user_data); + g_dbus_connection_call_internal (connection, bus_name, object_path, interface_name, method_name, parameters, reply_type, flags, timeout_msec, fd_list, cancellable, callback, user_data); } /** diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c index fae234f6d..be3dc5633 100644 --- a/gio/gdbusmethodinvocation.c +++ b/gio/gdbusmethodinvocation.c @@ -428,7 +428,7 @@ void g_dbus_method_invocation_return_value (GDBusMethodInvocation *invocation, GVariant *parameters) { - return g_dbus_method_invocation_return_value_internal (invocation, parameters, NULL); + g_dbus_method_invocation_return_value_internal (invocation, parameters, NULL); } #ifdef G_OS_UNIX @@ -451,7 +451,7 @@ g_dbus_method_invocation_return_value_with_unix_fd_list (GDBusMethodInvocation * GVariant *parameters, GUnixFDList *fd_list) { - return g_dbus_method_invocation_return_value_internal (invocation, parameters, fd_list); + g_dbus_method_invocation_return_value_internal (invocation, parameters, fd_list); } #endif diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c index 9da5f53ab..992280f43 100644 --- a/gio/gdbusproxy.c +++ b/gio/gdbusproxy.c @@ -2841,7 +2841,7 @@ g_dbus_proxy_call (GDBusProxy *proxy, GAsyncReadyCallback callback, gpointer user_data) { - return g_dbus_proxy_call_internal (proxy, method_name, parameters, flags, timeout_msec, NULL, cancellable, callback, user_data); + g_dbus_proxy_call_internal (proxy, method_name, parameters, flags, timeout_msec, NULL, cancellable, callback, user_data); } /** @@ -2960,7 +2960,7 @@ g_dbus_proxy_call_with_unix_fd_list (GDBusProxy *proxy, GAsyncReadyCallback callback, gpointer user_data) { - return g_dbus_proxy_call_internal (proxy, method_name, parameters, flags, timeout_msec, fd_list, cancellable, callback, user_data); + g_dbus_proxy_call_internal (proxy, method_name, parameters, flags, timeout_msec, fd_list, cancellable, callback, user_data); } /** diff --git a/gio/gtlsdatabase.c b/gio/gtlsdatabase.c index 9f2ff7bab..1131298c0 100644 --- a/gio/gtlsdatabase.c +++ b/gio/gtlsdatabase.c @@ -702,7 +702,7 @@ g_tls_database_lookup_certificate_for_handle_async (GTlsDatabase *sel g_return_if_fail (interaction == NULL || G_IS_TLS_INTERACTION (interaction)); g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable)); g_return_if_fail (G_TLS_DATABASE_GET_CLASS (self)->lookup_certificate_for_handle_async); - return G_TLS_DATABASE_GET_CLASS (self)->lookup_certificate_for_handle_async (self, + G_TLS_DATABASE_GET_CLASS (self)->lookup_certificate_for_handle_async (self, handle, interaction, flags,