hal/hald hald_runner.c,1.2,1.3 hald_dbus.c,1.51,1.52

[David Zeuthen]

Update of /cvs/hal/hal/hald
In directory gabe:/tmp/cvs-serv5603/hald

Modified Files:
	hald_runner.c hald_dbus.c 
Log Message:
2006-01-21  David Zeuthen  <davidz at redhat.com>

        * hald/hald_dbus.c (hald_exec_method_cb): Don't free errors as the
        caller owns the value

        * hald/hald_runner.c (call_notify): Don't copy value on error



Index: hald_runner.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald_runner.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hald_runner.c	21 Jan 2006 06:36:51 -0000	1.2
+++ hald_runner.c	21 Jan 2006 12:57:15 -0000	1.3
@@ -270,7 +270,8 @@
 }
 
 static void
-call_notify(DBusPendingCall *pending, void *user_data) {
+call_notify(DBusPendingCall *pending, void *user_data)
+{
   HelperData *hb = (HelperData *)user_data;
   dbus_uint32_t exitt = HALD_RUN_SUCCESS;
   dbus_int32_t return_code = 0;
@@ -297,10 +298,8 @@
   while (dbus_message_iter_next(&iter) &&
     dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING) {
     const char *value;
-    const char *copy;
     dbus_message_iter_get_basic(&iter, &value);
-    copy = g_strdup (value);
-    g_array_append_vals(error, &copy, 1);
+    g_array_append_vals(error, &value, 1);
   }
 
   hb->cb(hb->d, exitt, return_code, 

Index: hald_dbus.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald_dbus.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- hald_dbus.c	21 Jan 2006 06:36:51 -0000	1.51
+++ hald_dbus.c	21 Jan 2006 12:57:15 -0000	1.52
@@ -2539,8 +2539,6 @@
 		dbus_message_unref (reply);
 	}
 
-	g_free (exp_name);
-	g_free (exp_detail);
 	dbus_message_unref (message);
 }