[Xfce4-commits] [xfce/tumbler] 10/11: Fix a couple of compile warnings caused by return void with g_return_if_fail in functions returing boolean.

noreply at xfce.org noreply at xfce.org
Mon May 15 13:20:38 CEST 2017


This is an automated email from the git hooks/post-receive script.

ali pushed a commit to branch master
in repository xfce/tumbler.

commit 87ec6303a672bc66c538ff9df51f596fd9106d3e
Author: Ali Abdallah <aliovx at gmail.com>
Date:   Thu May 11 09:38:17 2017 +0200

    Fix a couple of compile warnings caused by return void
    with g_return_if_fail in functions returing boolean.
---
 tumblerd/tumbler-cache-service.c | 2 +-
 tumblerd/tumbler-manager.c       | 8 ++++----
 tumblerd/tumbler-service.c       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tumblerd/tumbler-cache-service.c b/tumblerd/tumbler-cache-service.c
index b9ac2de..79ceff6 100644
--- a/tumblerd/tumbler-cache-service.c
+++ b/tumblerd/tumbler-cache-service.c
@@ -584,6 +584,6 @@ tumbler_cache_service_cleanup (TumblerExportedCacheService   *skeleton,
 
 gboolean tumbler_cache_service_is_exported (TumblerCacheService *service)
 {
-  g_return_if_fail (TUMBLER_IS_CACHE_SERVICE(service));
+  g_return_val_if_fail (TUMBLER_IS_CACHE_SERVICE(service), FALSE);
   return service->dbus_interface_exported;
 }
diff --git a/tumblerd/tumbler-manager.c b/tumblerd/tumbler-manager.c
index 06acb96..9f837c2 100644
--- a/tumblerd/tumbler-manager.c
+++ b/tumblerd/tumbler-manager.c
@@ -338,9 +338,9 @@ tumbler_manager_register_cb (TumblerExportedManager *skeleton,
   TumblerThumbnailer *thumbnailer;
   const gchar        *sender_name;
 
-  g_return_if_fail (TUMBLER_IS_MANAGER (manager));
-  g_return_if_fail (uri_schemes != NULL);
-  g_return_if_fail (mime_types != NULL);
+  g_return_val_if_fail (TUMBLER_IS_MANAGER (manager), FALSE);
+  g_return_val_if_fail (uri_schemes != NULL, FALSE);
+  g_return_val_if_fail (mime_types != NULL, FALSE);
   
   sender_name = g_dbus_method_invocation_get_sender (invocation);
 
@@ -1899,7 +1899,7 @@ tumbler_manager_new (GDBusConnection         *connection,
 
 gboolean tumbler_manager_is_exported (TumblerManager *manager) 
 {
-  g_return_if_fail (TUMBLER_IS_MANAGER (manager));
+  g_return_val_if_fail (TUMBLER_IS_MANAGER (manager), FALSE);
  
   return manager->dbus_interface_exported;
 }
diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index e54e99a..929a125 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -961,6 +961,6 @@ tumbler_service_get_flavors_cb  (TumblerExportedService  *skeleton,
 
 gboolean tumbler_service_is_exported (TumblerService *service)
 {
-  g_return_if_fail (TUMBLER_IS_SERVICE(service));
+  g_return_val_if_fail (TUMBLER_IS_SERVICE(service), FALSE);
   return service->dbus_interface_exported;
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list