diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-08-04 21:51:10 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-08-04 21:51:10 +0200 |
| commit | 2709ae4c8e684f4cbee1c0c99c42fb4afdc8d455 (patch) | |
| tree | 3e745aa6b9f460f25ba01f2fab024b38a2340a90 | |
| parent | 7a6368d26192e81529bc0d39c9c343a822ff175f (diff) | |
Move error helpers to bluetoothd source
| -rw-r--r-- | common/Makefile.am | 5 | ||||
| -rw-r--r-- | input/device.c | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/error.c (renamed from common/error.c) | 0 | ||||
| -rw-r--r-- | src/error.h (renamed from common/error.h) | 0 |
5 files changed, 5 insertions, 8 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 3a5add7c..79b533c5 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,9 +1,8 @@ noinst_LIBRARIES = libhelper.a -libhelper_a_SOURCES = oui.h oui.c textfile.h textfile.c \ - logging.h logging.c error.h error.c \ - glib-helper.h glib-helper.c sdp-xml.h sdp-xml.c sdp-glib.c +libhelper_a_SOURCES = oui.h oui.c textfile.h textfile.c logging.h logging.c \ + glib-helper.h glib-helper.c sdp-xml.h sdp-xml.c sdp-glib.c noinst_PROGRAMS = test_textfile diff --git a/input/device.c b/input/device.c index 984c35bd..ccaf0374 100644 --- a/input/device.c +++ b/input/device.c @@ -603,8 +603,7 @@ static void control_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src, failed: iconn->ctrl_sk = -1; - error_connection_attempt_failed(idev->conn, - iconn->pending_connect, -err); + connection_attempt_failed(iconn->pending_connect, -err); dbus_message_unref(iconn->pending_connect); iconn->pending_connect = NULL; } diff --git a/src/Makefile.am b/src/Makefile.am index 04144dd3..664db750 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,11 +19,10 @@ bluetoothd_SOURCES = main.c hcid.h sdpd.h \ sdpd-server.c sdpd-request.c sdpd-service.c \ sdpd-database.c security.c storage.c \ parser.h parser.y lexer.l kword.c kword.h \ - server.h server.c manager.h manager.c \ + server.h server.c manager.h manager.c error.h error.c \ adapter.h adapter.c device.h device.c plugin.h plugin.c \ - dbus-common.c dbus-common.h \ + dbus-common.c dbus-common.h dbus-hci.h dbus-hci.c \ dbus-database.c dbus-database.h dbus-service.c dbus-service.h \ - dbus-hci.h dbus-hci.c \ telephony.h telephony.c agent.h agent.c bluetoothd_LDADD = $(top_builddir)/common/libhelper.a \ diff --git a/common/error.c b/src/error.c index 825cde4f..825cde4f 100644 --- a/common/error.c +++ b/src/error.c diff --git a/common/error.h b/src/error.h index 644e385f..644e385f 100644 --- a/common/error.h +++ b/src/error.h |