summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudio Takahasi <claudio.takahasi@openbossa.org>2007-03-22 17:07:24 +0000
committerClaudio Takahasi <claudio.takahasi@openbossa.org>2007-03-22 17:07:24 +0000
commitf844fe4f4284e2961cc4a6ee17cc7ede18a9aaf8 (patch)
treea8239fb3758267f9b5d8af9c84fd2b05a99d9e2f
parent9cefcf43f42f48d59804c1832e8e5fc9a5abe26e (diff)
network: removed err_generic function
-rw-r--r--network/error.c7
-rw-r--r--network/error.h2
-rw-r--r--network/manager.c6
3 files changed, 3 insertions, 12 deletions
diff --git a/network/error.c b/network/error.c
index ec3f9298..a4b38190 100644
--- a/network/error.c
+++ b/network/error.c
@@ -38,13 +38,6 @@ DBusHandlerResult err_unknown_connection(DBusConnection *conn,
"Unknown connection path"));
}
-DBusHandlerResult err_generic(DBusConnection *conn, DBusMessage *msg,
- const char *name, const char *str)
-{
- return send_message_and_unref(conn,
- dbus_message_new_error(msg, name, str));
-}
-
DBusHandlerResult err_does_not_exist(DBusConnection *conn, DBusMessage *msg,
const char *str)
{
diff --git a/network/error.h b/network/error.h
index e28002e7..29b73908 100644
--- a/network/error.h
+++ b/network/error.h
@@ -25,8 +25,6 @@
DBusHandlerResult err_unknown_connection(DBusConnection *conn,
DBusMessage *msg);
-DBusHandlerResult err_generic(DBusConnection *conn, DBusMessage *msg,
- const char *name, const char *str);
DBusHandlerResult err_does_not_exist(DBusConnection *conn,
DBusMessage *msg, const char *str);
DBusHandlerResult err_failed(DBusConnection *conn, DBusMessage *msg,
diff --git a/network/manager.c b/network/manager.c
index a73c3147..c9a8d4e4 100644
--- a/network/manager.c
+++ b/network/manager.c
@@ -126,7 +126,7 @@ static DBusHandlerResult create_server(DBusConnection *conn,
if (!dbus_message_get_args(msg, &derr,
DBUS_TYPE_STRING, &uuid,
DBUS_TYPE_INVALID)) {
- err_generic(conn, msg, derr.name, derr.message);
+ err_invalid_args(conn, msg, derr.message);
dbus_error_free(&derr);
return DBUS_HANDLER_RESULT_HANDLED;
}
@@ -162,7 +162,7 @@ static DBusHandlerResult remove_path(DBusConnection *conn,
if (!dbus_message_get_args(msg, &derr,
DBUS_TYPE_STRING, &path,
DBUS_TYPE_INVALID)) {
- err_generic(conn, msg, derr.name, derr.message);
+ err_invalid_args(conn, msg, derr.message);
dbus_error_free(&derr);
return DBUS_HANDLER_RESULT_HANDLED;
}
@@ -224,7 +224,7 @@ static DBusHandlerResult create_connection(DBusConnection *conn,
DBUS_TYPE_STRING, &addr,
DBUS_TYPE_STRING, &uuid,
DBUS_TYPE_INVALID)) {
- err_generic(conn, msg, derr.name, derr.message);
+ err_invalid_args(conn, msg, derr.message);
dbus_error_free(&derr);
return DBUS_HANDLER_RESULT_HANDLED;
}