diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2006-04-28 13:38:50 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2006-04-28 13:38:50 +0000 |
| commit | fedb15c7679ca336a1e66826678679c8a59c1bec (patch) | |
| tree | d7c2a61e10f7bf96bb11c4d80c124b6213ddda4f /hcid/dbus-adapter.c | |
| parent | d69f92a7657292734448903024f4236a94874dd8 (diff) | |
Remove get_dbus_connection() function
Diffstat (limited to 'hcid/dbus-adapter.c')
| -rw-r--r-- | hcid/dbus-adapter.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c index 49c8c526..1a57bf59 100644 --- a/hcid/dbus-adapter.c +++ b/hcid/dbus-adapter.c @@ -635,7 +635,6 @@ failed: static DBusHandlerResult handle_dev_set_minor_class_req(DBusConnection *conn, DBusMessage *msg, void *data) { struct hci_dbus_data *dbus_data = data; - DBusConnection *connection = get_dbus_connection(); DBusMessage *reply, *signal; DBusError err; bdaddr_t bdaddr; @@ -704,8 +703,8 @@ static DBusHandlerResult handle_dev_set_minor_class_req(DBusConnection *conn, DB DBUS_TYPE_STRING, &minor, DBUS_TYPE_INVALID); if (signal) { - dbus_connection_send(connection, signal, NULL); - dbus_connection_flush(connection); + dbus_connection_send(conn, signal, NULL); + dbus_connection_flush(conn); dbus_message_unref(signal); } @@ -1261,7 +1260,6 @@ static DBusHandlerResult handle_dev_get_remote_alias_req(DBusConnection *conn, D static DBusHandlerResult handle_dev_set_remote_alias_req(DBusConnection *conn, DBusMessage *msg, void *data) { struct hci_dbus_data *dbus_data = data; - DBusConnection *connection = get_dbus_connection(); DBusMessage *reply, *signal; DBusError err; char *str_ptr, *addr_ptr; @@ -1300,8 +1298,8 @@ static DBusHandlerResult handle_dev_set_remote_alias_req(DBusConnection *conn, D DBUS_TYPE_STRING, &str_ptr, DBUS_TYPE_INVALID); if (signal) { - dbus_connection_send(connection, signal, NULL); - dbus_connection_flush(connection); + dbus_connection_send(conn, signal, NULL); + dbus_connection_flush(conn); dbus_message_unref(signal); } @@ -1311,7 +1309,6 @@ static DBusHandlerResult handle_dev_set_remote_alias_req(DBusConnection *conn, D static DBusHandlerResult handle_dev_clear_remote_alias_req(DBusConnection *conn, DBusMessage *msg, void *data) { struct hci_dbus_data *dbus_data = data; - DBusConnection *connection = get_dbus_connection(); DBusMessage *reply, *signal; DBusError err; char *addr_ptr; @@ -1353,8 +1350,8 @@ static DBusHandlerResult handle_dev_clear_remote_alias_req(DBusConnection *conn, DBUS_TYPE_STRING, &addr_ptr, DBUS_TYPE_INVALID); if (signal) { - dbus_connection_send(connection, signal, NULL); - dbus_connection_flush(connection); + dbus_connection_send(conn, signal, NULL); + dbus_connection_flush(conn); dbus_message_unref(signal); } } @@ -1727,7 +1724,6 @@ static DBusHandlerResult handle_dev_remove_bonding_req(DBusConnection *conn, DBu { struct hci_dbus_data *dbus_data = data; struct slist *l; - DBusConnection *connection = get_dbus_connection(); DBusMessage *reply; DBusMessage *signal; DBusError err; @@ -1784,8 +1780,8 @@ static DBusHandlerResult handle_dev_remove_bonding_req(DBusConnection *conn, DBu DBUS_TYPE_STRING, &addr_ptr, DBUS_TYPE_INVALID); if (signal) { - dbus_connection_send(connection, signal, NULL); - dbus_connection_flush(connection); + dbus_connection_send(conn, signal, NULL); + dbus_connection_flush(conn); dbus_message_unref(signal); } |