>From 430ed9b2367695a0eb5220170ef1309084d3bfdc Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 20 May 2008 10:49:32 +0100
Subject: [PATCH] Fix return values for async methods

Async methods should return "out" variables using dbus_g_method_return(),
not through function parameters. Fixes crashing using those functions.
---
 src/device.c   |   28 ++++++++++++----------------
 src/device.xml |    2 +-
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/device.c b/src/device.c
index d793e8d..e941500 100644
--- a/src/device.c
+++ b/src/device.c
@@ -36,9 +36,9 @@ static void fprint_device_claim(FprintDevice *rdev,
 static void fprint_device_release(FprintDevice *rdev,
 	DBusGMethodInvocation *context);
 static void fprint_device_list_enrolled_fingers(FprintDevice *rdev,
-	GArray **fingers, DBusGMethodInvocation *context);
+	DBusGMethodInvocation *context);
 static void fprint_device_load_print_data(FprintDevice *rdev,
-	guint32 finger_num, guint32 *print_id, DBusGMethodInvocation *context);
+	guint32 finger_num, DBusGMethodInvocation *context);
 static void fprint_device_unload_print_data(FprintDevice *rdev,
 	guint32 print_id, DBusGMethodInvocation *context);
 static void fprint_device_verify_start(FprintDevice *rdev,
@@ -52,9 +52,9 @@ static void fprint_device_enroll_stop(FprintDevice *rdev,
 static gboolean fprint_device_set_storage_type(FprintDevice *rdev,
 	gint type);
 static void fprint_device_list_enrolled_fingers_from_storage(FprintDevice *rdev, 
-	gchar *username, GArray **fingers, DBusGMethodInvocation *context);
+	gchar *username, DBusGMethodInvocation *context);
 static void fprint_device_load_print_data_from_storage(FprintDevice *rdev,
-	guint32 finger_num, gchar *username, guint32 *print_id, DBusGMethodInvocation *context);
+	guint32 finger_num, gchar *username, DBusGMethodInvocation *context);
 
 #include "device-dbus-glue.h"
 
@@ -325,7 +325,7 @@ static void fprint_device_release(FprintDevice *rdev,
 }
 
 static void fprint_device_list_enrolled_fingers(FprintDevice *rdev,
-	GArray **fingers, DBusGMethodInvocation *context)
+	DBusGMethodInvocation *context)
 {
 	FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev);
 	struct fp_dscv_print **prints;
@@ -354,13 +354,12 @@ static void fprint_device_list_enrolled_fingers(FprintDevice *rdev,
 		}
 
 	fp_dscv_prints_free(prints);
-	*fingers = ret;
 
-	dbus_g_method_return(context);
+	dbus_g_method_return(context, ret);
 }
 
 static void fprint_device_load_print_data(FprintDevice *rdev,
-	guint32 finger_num, guint32 *print_id, DBusGMethodInvocation *context)
+	guint32 finger_num, DBusGMethodInvocation *context)
 {
 	FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev);
 	struct session_data *session = priv->session;
@@ -415,9 +414,8 @@ static void fprint_device_load_print_data(FprintDevice *rdev,
 
 	g_message("load print data finger %d for device %d = %d",
 		finger_num, priv->id, lprint->id);
-	*print_id = lprint->id;
 
-	dbus_g_method_return(context);
+	dbus_g_method_return(context, lprint->id);
 }
 
 static void fprint_device_unload_print_data(FprintDevice *rdev,
@@ -627,7 +625,7 @@ static gboolean fprint_device_set_storage_type(FprintDevice *rdev,
 }
 
 static void fprint_device_list_enrolled_fingers_from_storage(FprintDevice *rdev,
-	gchar *username, GArray **fingers, DBusGMethodInvocation *context)
+	gchar *username, DBusGMethodInvocation *context)
 {
 	FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev);
 	GError *error = NULL;
@@ -655,13 +653,12 @@ static void fprint_device_list_enrolled_fingers_from_storage(FprintDevice *rdev,
 	}
 
 	g_slist_free(prints);
-	*fingers = ret;
 
-	dbus_g_method_return(context);
+	dbus_g_method_return(context, ret);
 }
 
 static void fprint_device_load_print_data_from_storage(FprintDevice *rdev,
-	guint32 finger_num, gchar *username, guint32 *print_id, DBusGMethodInvocation *context)
+	guint32 finger_num, gchar *username, DBusGMethodInvocation *context)
 {
 	FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev);
 	struct session_data *session = priv->session;
@@ -692,8 +689,7 @@ static void fprint_device_load_print_data_from_storage(FprintDevice *rdev,
 
 	g_message("load print data finger %d for device %d = %d",
 		finger_num, priv->id, lprint->id);
-	*print_id = lprint->id;
 
-	dbus_g_method_return(context);
+	dbus_g_method_return(context, lprint->id);
 }
 
diff --git a/src/device.xml b/src/device.xml
index 9843316..45b912f 100644
--- a/src/device.xml
+++ b/src/device.xml
@@ -59,7 +59,7 @@
 			<arg type="u" name="storage_id" direction="in" />
 			<annotation name="org.freedesktop.DBus.GLib.Async" value="" />
 		</method>
-		
+
 		<method name="ListEnrolledFingersFromStorage">
 			<arg type="s" name="username" direction="in" />
 			<arg type="au" name="enrolled_fingers" direction="out" />
-- 
1.5.4.5