summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hcid/dbus-adapter.c9
-rw-r--r--hcid/dbus-error.c4
2 files changed, 5 insertions, 8 deletions
diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c
index 4987afc4..7c06eab7 100644
--- a/hcid/dbus-adapter.c
+++ b/hcid/dbus-adapter.c
@@ -1354,13 +1354,14 @@ DBusHandlerResult msg_func_device(DBusConnection *conn, DBusMessage *msg, void *
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
if (dbus_data->path_id == ADAPTER_ROOT_ID) {
- /* Adapter is down(path unregistered) or the path is wrong */
+ /* Adapter is down (path unregistered) or the path is wrong */
return error_no_such_adapter(conn, msg);
}
handler = find_service_handler(dev_services, msg);
- if (!handler)
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- return handler(conn, msg, data);
+ if (handler)
+ return handler(conn, msg, data);
+
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
diff --git a/hcid/dbus-error.c b/hcid/dbus-error.c
index dddf8498..412468a1 100644
--- a/hcid/dbus-error.c
+++ b/hcid/dbus-error.c
@@ -27,10 +27,6 @@
#include <stdio.h>
#include <errno.h>
-#include <sys/socket.h>
-
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
#include <dbus/dbus.h>