[telepathy-gabble/master] Definitely return NULL on error in the *_finish functions.

Mike Ruprecht mike.ruprecht at collabora.co.uk
Mon Dec 7 07:36:15 PST 2009


---
 tests/twisted/test-resolver.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tests/twisted/test-resolver.c b/tests/twisted/test-resolver.c
index b040ec6..8cf4bcb 100644
--- a/tests/twisted/test-resolver.c
+++ b/tests/twisted/test-resolver.c
@@ -122,11 +122,12 @@ lookup_service_finish (GResolver *resolver,
                        GAsyncResult *result,
                        GError **error)
 {
-  GList *res = NULL;
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-  g_simple_async_result_propagate_error (simple, error);
-  res = g_simple_async_result_get_op_res_gpointer (simple);
-  return res;
+
+  if (g_simple_async_result_propagate_error (simple, error))
+    return NULL;
+
+  return g_simple_async_result_get_op_res_gpointer (simple);
 }
 
 static void
@@ -157,11 +158,12 @@ lookup_by_name_finish (GResolver *resolver,
     GAsyncResult *result,
     GError **error)
 {
-  GList *res = NULL;
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-  g_simple_async_result_propagate_error (simple, error);
-  res = g_simple_async_result_get_op_res_gpointer (simple);
-  return res;
+
+  if (g_simple_async_result_propagate_error (simple, error))
+    return NULL;
+
+  return g_simple_async_result_get_op_res_gpointer (simple);
 }
 
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list