diff options
| -rw-r--r-- | common/error.c | 21 | ||||
| -rw-r--r-- | common/error.h | 1 | ||||
| -rw-r--r-- | hcid/dbus-error.c | 15 | ||||
| -rw-r--r-- | hcid/dbus-error.h | 1 |
4 files changed, 22 insertions, 16 deletions
diff --git a/common/error.c b/common/error.c index daabe48d..58999393 100644 --- a/common/error.c +++ b/common/error.c @@ -27,6 +27,7 @@ #include <config.h> #endif +#include <stdio.h> #include <string.h> #include <errno.h> @@ -240,3 +241,23 @@ DBusHandlerResult error_common_reply(DBusConnection *conn, DBusMessage *msg, return dbus_connection_send_and_unref(conn, derr); } + +/** + org.bluez.Error.UnknownMethod: + + Used in experimental code. +*/ +DBusHandlerResult error_unknown_method(DBusConnection *conn, DBusMessage *msg) +{ + char error[128]; + const char *signature = dbus_message_get_signature(msg); + const char *method = dbus_message_get_member(msg); + const char *interface = dbus_message_get_interface(msg); + + snprintf(error, 128, "Method \"%s\" with signature \"%s\" on interface \"%s\" doesn't exist", + method, signature, interface); + + return send_message_and_unref(conn, + dbus_message_new_error(msg, ERROR_INTERFACE ".UnknownMethod", + error)); +} diff --git a/common/error.h b/common/error.h index 03d0c182..44b6f417 100644 --- a/common/error.h +++ b/common/error.h @@ -74,3 +74,4 @@ DBusHandlerResult error_failed_errno(DBusConnection *conn, DBusMessage *msg, DBusHandlerResult error_common_reply(DBusConnection *conn, DBusMessage *msg, const char *name, const char *descr); +DBusHandlerResult error_unknown_method(DBusConnection *conn, DBusMessage *msg); diff --git a/hcid/dbus-error.c b/hcid/dbus-error.c index e350ec9c..66fb2490 100644 --- a/hcid/dbus-error.c +++ b/hcid/dbus-error.c @@ -45,21 +45,6 @@ DBusHandlerResult error_not_ready(DBusConnection *conn, DBusMessage *msg) dbus_message_new_error(msg, ERROR_INTERFACE ".NotReady", "Adapter is not ready")); } -DBusHandlerResult error_unknown_method(DBusConnection *conn, DBusMessage *msg) -{ - char error[128]; - const char *signature = dbus_message_get_signature(msg); - const char *method = dbus_message_get_member(msg); - const char *interface = dbus_message_get_interface(msg); - - snprintf(error, 128, "Method \"%s\" with signature \"%s\" on interface \"%s\" doesn't exist", - method, signature, interface); - - return send_message_and_unref(conn, - dbus_message_new_error(msg, ERROR_INTERFACE ".UnknownMethod", - error)); -} - DBusHandlerResult error_not_authorized(DBusConnection *conn, DBusMessage *msg) { return send_message_and_unref(conn, diff --git a/hcid/dbus-error.h b/hcid/dbus-error.h index ab170519..b50c4772 100644 --- a/hcid/dbus-error.h +++ b/hcid/dbus-error.h @@ -27,7 +27,6 @@ */ DBusHandlerResult error_not_ready(DBusConnection *conn, DBusMessage *msg); -DBusHandlerResult error_unknown_method(DBusConnection *conn, DBusMessage *msg); DBusHandlerResult error_not_authorized(DBusConnection *conn, DBusMessage *msg); DBusHandlerResult error_rejected(DBusConnection *conn, DBusMessage *msg); DBusHandlerResult error_no_such_adapter(DBusConnection *conn, DBusMessage *msg); |