From 819e5e4a8b5b71d6ac676f3a869b8cf290192657 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 19 Jan 2007 03:05:28 +0000 Subject: Return error in case of service searches --- daemon/service.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'daemon/service.c') diff --git a/daemon/service.c b/daemon/service.c index f3f43a0d..b56087c4 100644 --- a/daemon/service.c +++ b/daemon/service.c @@ -67,13 +67,10 @@ DBusMessage *service_find(DBusMessage *msg) debug("Searching service with pattern \"%s\"", pattern); - reply = dbus_message_new_method_return(msg); - if (!reply) - return NULL; + reply = dbus_message_new_error(msg, ERROR_INTERFACE ".NotFound", + "Service does not exists"); - dbus_message_append_args(reply, DBUS_TYPE_INVALID); - - return 0; + return reply; } DBusMessage *service_activate(DBusMessage *msg) @@ -86,13 +83,10 @@ DBusMessage *service_activate(DBusMessage *msg) debug("Activating service with pattern \"%s\"", pattern); - reply = dbus_message_new_method_return(msg); - if (!reply) - return NULL; + reply = dbus_message_new_error(msg, ERROR_INTERFACE ".NotFound", + "Service does not exists"); - dbus_message_append_args(reply, DBUS_TYPE_INVALID); - - return 0; + return reply; } static void config_notify(int action, const char *name, void *data) -- cgit