From becacb17a40c68c5bd29d67506b183e3f6d7393f Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@arnaudov.name>
Date: Mon, 10 May 2010 02:47:09 +0300
Subject: [PATCH] jackdbus: improved handling of server start/stop failures

 * Don't override detailed error string with generic one
 * Set the D-Bus reply error in case of jackctl_server_stop() failure
 * Set the D-Bus reply error in case of jack_controller_patchbay_init() failure
 * Don't set the D-Bus reply error in case of jack_deactivate() failure because
   this failure does not cause jack_controller_stop_server() failure and thus
   will cause memory leak.
---
 dbus/controller.c               | 10 ++++------
 dbus/controller_iface_control.c | 11 +++++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dbus/controller.c b/dbus/controller.c
index 17b51fdf..11670e12 100644
--- a/dbus/controller.c
+++ b/dbus/controller.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C ; c-basic-offset: 4 -*- */
 /*
-    Copyright (C) 2007,2008 Nedko Arnaudov
+    Copyright (C) 2007,2008,2010 Nedko Arnaudov
     Copyright (C) 2007-2008 Juuso Alasuutari
 
     This program is free software; you can redistribute it and/or modify
@@ -171,7 +171,6 @@ jack_controller_start_server(
     if (controller_ptr->client == NULL)
     {
         jack_dbus_error(dbus_call_context_ptr, JACK_DBUS_ERROR_GENERIC, "failed to create dbusapi jack client");
-
         goto fail_stop_server;
     }
 
@@ -179,13 +178,12 @@ jack_controller_start_server(
     if (ret != 0)
     {
         jack_dbus_error(dbus_call_context_ptr, JACK_DBUS_ERROR_GENERIC, "failed to set xrun callback. error is %d", ret);
-
         goto fail_close_client;
     }
 
     if (!jack_controller_patchbay_init(controller_ptr))
     {
-        jack_error("Failed to initialize patchbay district");
+        jack_dbus_error(dbus_call_context_ptr, JACK_DBUS_ERROR_GENERIC, "Failed to initialize patchbay district");
         goto fail_close_client;
     }
 
@@ -193,7 +191,6 @@ jack_controller_start_server(
     if (ret != 0)
     {
         jack_dbus_error(dbus_call_context_ptr, JACK_DBUS_ERROR_GENERIC, "failed to activate dbusapi jack client. error is %d", ret);
-
         goto fail_patchbay_uninit;
     }
 
@@ -241,7 +238,7 @@ jack_controller_stop_server(
     ret = jack_deactivate(controller_ptr->client);
     if (ret != 0)
     {
-        jack_dbus_error(dbus_call_context_ptr, JACK_DBUS_ERROR_GENERIC, "failed to deactivate dbusapi jack client. error is %d", ret);
+        jack_error("failed to deactivate dbusapi jack client. error is %d", ret);
     }
 
     jack_controller_patchbay_uninit(controller_ptr);
@@ -256,6 +253,7 @@ jack_controller_stop_server(
 
     if (!jackctl_server_stop(controller_ptr->server))
     {
+        jack_dbus_error(dbus_call_context_ptr, JACK_DBUS_ERROR_GENERIC, "Failed to stop server");
         return FALSE;
     }
 
diff --git a/dbus/controller_iface_control.c b/dbus/controller_iface_control.c
index 967cde19..587d9264 100644
--- a/dbus/controller_iface_control.c
+++ b/dbus/controller_iface_control.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C ; c-basic-offset: 4 -*- */
 /*
-    Copyright (C) 2007,2008 Nedko Arnaudov
+    Copyright (C) 2007,2008,2010 Nedko Arnaudov
     Copyright (C) 2007-2008 Juuso Alasuutari
 
     This program is free software; you can redistribute it and/or modify
@@ -87,7 +87,8 @@ jack_control_run_method(
     {
         if (!jack_controller_start_server(controller_ptr, call))
         {
-            jack_dbus_error(call, JACK_DBUS_ERROR_GENERIC, "Failed to start server");
+            /* the reply is set by the failed function */
+            assert(call->reply != NULL);
             return true;
         }
 
@@ -97,7 +98,8 @@ jack_control_run_method(
     {
         if (!jack_controller_stop_server(controller_ptr, call))
         {
-            jack_dbus_error(call, JACK_DBUS_ERROR_GENERIC, "Failed to stop server");
+            /* the reply is set by the failed function */
+            assert(call->reply != NULL);
             return true;
         }
 
@@ -107,7 +109,8 @@ jack_control_run_method(
     {
         if (!jack_controller_switch_master(controller_ptr, call))
         {
-            jack_dbus_error(call, JACK_DBUS_ERROR_GENERIC, "Failed to switch master");
+            /* the reply is set by the failed function */
+            assert(call->reply != NULL);
             return true;
         }