From fcd0c0c4cfac3fb3276f1019dfb70046573ec153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= Date: Tue, 4 Sep 2012 16:04:30 -0300 Subject: [PATCH] mgmt: Print error message when start_discovery fails If we fail to communicate with the MGMT socket is better to print the error message on the mgmtops plugin, where it really happened, instead of leaving this job to its users. --- src/adapter.c | 6 +----- src/mgmt.c | 7 +++++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index f507aa508..b5462019e 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -1004,13 +1004,9 @@ struct btd_device *adapter_get_device(DBusConnection *conn, static gboolean discovery_cb(gpointer user_data) { struct btd_adapter *adapter = user_data; - int err; adapter->discov_id = 0; - - err = mgmt_start_discovery(adapter->dev_id); - if (err < 0) - error("start_discovery: %s (%d)", strerror(-err), -err); + mgmt_start_discovery(adapter->dev_id); return FALSE; } diff --git a/src/mgmt.c b/src/mgmt.c index 912657262..3f83fdf49 100644 --- a/src/mgmt.c +++ b/src/mgmt.c @@ -2034,8 +2034,11 @@ int mgmt_start_discovery(int index) cp->type = info->discov_type; - if (write(mgmt_sock, buf, sizeof(buf)) < 0) - return -errno; + if (write(mgmt_sock, buf, sizeof(buf)) < 0) { + int err = -errno; + error("failed to write to MGMT socket: %s", strerror(-err)); + return err; + } return 0; } -- 2.47.3