Fix errno string conversion

Numerous places were passing errno as a negative value to strerror which
obviously gives a bogus error message. This patch fixes that.

2 files changed, 29 insertions, 29 deletions

diff --git a/src/adapter.c b/src/adapter.c
index 68d967f30..024de2051 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -233,9 +233,9 @@ int pending_remote_name_cancel(struct btd_adapter *adapter)
 
 	if (hci_read_remote_name_cancel(dd, &dev->bdaddr,
 					HCI_REQ_TIMEOUT) < 0) {
-		error("Remote name cancel failed: %s(%d)", strerror(errno),
-									errno);
 		err = -errno;
+		error("Remote name cancel failed: %s(%d)",
+						strerror(errno), errno);
 	}
 
 	/* free discovered devices list */
@@ -261,7 +261,7 @@ static int set_limited_discoverable(int dd, const uint8_t *cls,
 	if (hci_write_current_iac_lap(dd, num, lap, HCI_REQ_TIMEOUT) < 0) {
 		int err = -errno;
 		error("Can't write current IAC LAP: %s(%d)",
-				strerror(err), err);
+						strerror(errno), errno);
 		return err;
 	}
 
@@ -280,7 +280,7 @@ static int set_limited_discoverable(int dd, const uint8_t *cls,
 	if (hci_write_class_of_dev(dd, dev_class, HCI_REQ_TIMEOUT) < 0) {
 		int err = -errno;
 		error("Can't write class of device: %s (%d)",
-							strerror(err), err);
+						strerror(errno), errno);
 		return err;
 	}
 
@@ -858,14 +858,14 @@ static int adapter_set_name(struct btd_adapter *adapter, const char *name)
 	if (dd < 0) {
 		err = -errno;
 		error("Can't open device hci%d: %s (%d)",
-					adapter->dev_id, strerror(err), err);
+				adapter->dev_id, strerror(errno), errno);
 		return err;
 	}
 
 	if (hci_write_local_name(dd, name, HCI_REQ_TIMEOUT) < 0) {
 		err = -errno;
 		error("Can't write name for hci%d: %s (%d)",
-					adapter->dev_id, strerror(err), err);
+				adapter->dev_id, strerror(errno), errno);
 		hci_close_dev(dd);
 		return err;
 	}
@@ -1054,7 +1054,7 @@ static int start_inquiry(struct btd_adapter *adapter)
 	if (hci_send_req(dd, &rq, HCI_REQ_TIMEOUT) < 0) {
 		err = -errno;
 		error("Unable to start inquiry: %s (%d)",
-			strerror(err), err);
+						strerror(errno), errno);
 		hci_close_dev(dd);
 		return err;
 	}
@@ -1104,7 +1104,7 @@ static int start_periodic_inquiry(struct btd_adapter *adapter)
 	if (hci_send_req(dd, &rq, HCI_REQ_TIMEOUT) < 0) {
 		err = -errno;
 		error("Unable to start periodic inquiry: %s (%d)",
-				strerror(err), err);
+						strerror(errno), errno);
 		hci_close_dev(dd);
 		return err;
 	}
@@ -1770,14 +1770,14 @@ static int adapter_read_bdaddr(uint16_t dev_id, bdaddr_t *bdaddr)
 	if (dd < 0) {
 		err = -errno;
 		error("Can't open device hci%d: %s (%d)",
-					dev_id, strerror(err), err);
+					dev_id, strerror(errno), errno);
 		return err;
 	}
 
 	if (hci_read_bd_addr(dd, bdaddr, HCI_REQ_TIMEOUT) < 0) {
 		err = -errno;
 		error("Can't read address for hci%d: %s (%d)",
-					dev_id, strerror(err), err);
+					dev_id, strerror(errno), errno);
 		hci_close_dev(dd);
 		return err;
 	}
@@ -1842,7 +1842,7 @@ static int adapter_setup(struct btd_adapter *adapter, int dd)
 	if (hci_write_inquiry_mode(dd, inqmode, HCI_REQ_TIMEOUT) < 0) {
 		err = -errno;
 		error("Can't write inquiry mode for %s: %s (%d)",
-					adapter->path, strerror(err), err);
+					adapter->path, strerror(errno), errno);
 		hci_close_dev(dd);
 		return err;
 	}
@@ -2112,14 +2112,14 @@ int adapter_start(struct btd_adapter *adapter)
 	if (dd < 0) {
 		err = -errno;
 		error("Can't open adapter %s: %s (%d)",
-					adapter->path, strerror(err), err);
+					adapter->path, strerror(errno), errno);
 		return err;
 	}
 
 	if (hci_read_local_version(dd, &ver, HCI_REQ_TIMEOUT) < 0) {
 		err = -errno;
 		error("Can't read version info for %s: %s (%d)",
-					adapter->path, strerror(err), err);
+					adapter->path, strerror(errno), errno);
 		hci_close_dev(dd);
 		return err;
 	}
@@ -2132,7 +2132,7 @@ int adapter_start(struct btd_adapter *adapter)
 	if (hci_read_local_features(dd, features, HCI_REQ_TIMEOUT) < 0) {
 		err = -errno;
 		error("Can't read features for %s: %s (%d)",
-					adapter->path, strerror(err), err);
+					adapter->path, strerror(errno), errno);
 		hci_close_dev(dd);
 		return err;
 	}
@@ -2142,7 +2142,7 @@ int adapter_start(struct btd_adapter *adapter)
 	if (hci_read_class_of_dev(dd, dev->class, HCI_REQ_TIMEOUT) < 0) {
 		err = -errno;
 		error("Can't read class of adapter on %s: %s (%d)",
-					adapter->path, strerror(err), err);
+					adapter->path, strerror(errno), errno);
 		hci_close_dev(dd);
 		return err;
 	}
@@ -2151,7 +2151,7 @@ int adapter_start(struct btd_adapter *adapter)
 						HCI_REQ_TIMEOUT) < 0) {
 		err = -errno;
 		error("Can't read local name on %s: %s (%d)",
-					adapter->path, strerror(err), err);
+					adapter->path, strerror(errno), errno);
 		hci_close_dev(dd);
 		return err;
 	}
@@ -2168,7 +2168,7 @@ int adapter_start(struct btd_adapter *adapter)
 						HCI_REQ_TIMEOUT) < 0) {
 		err = -errno;
 		error("Can't read simple pairing mode on %s: %s (%d)",
-					adapter->path, strerror(err), err);
+					adapter->path, strerror(errno), errno);
 		/* Fall through since some chips have broken
 		 * read_simple_pairing_mode behavior */
 	}
@@ -2328,7 +2328,7 @@ int adapter_update(struct btd_adapter *adapter, uint8_t new_svc,
 	if (dd < 0) {
 		int err = -errno;
 		error("Can't open adapter %s: %s (%d)",
-					adapter->path, strerror(err), err);
+					adapter->path, strerror(errno), errno);
 		return err;
 	}
 
diff --git a/src/dbus-hci.c b/src/dbus-hci.c
index 6c9d36c34..4814f103e 100644
--- a/src/dbus-hci.c
+++ b/src/dbus-hci.c
@@ -1019,7 +1019,7 @@ int set_service_classes(int dd, const uint8_t *cls, uint8_t value)
 	if (hci_write_class_of_dev(dd, dev_class, HCI_REQ_TIMEOUT) < 0) {
 		int err = -errno;
 		error("Can't write class of device: %s (%d)",
-							strerror(err), err);
+						strerror(errno), errno);
 		return err;
 	}
 
@@ -1039,7 +1039,7 @@ int set_major_and_minor_class(int dd, const uint8_t *cls,
 	if (hci_write_class_of_dev(dd, dev_class, HCI_REQ_TIMEOUT) < 0) {
 		int err = -errno;
 		error("Can't write class of device: %s (%d)",
-							strerror(err), err);
+						strerror(errno), errno);
 		return err;
 	}
 
@@ -1389,15 +1389,15 @@ int cancel_discovery(struct btd_adapter *adapter)
 	if (dev) {
 		if (remote_name_cancel(dd, &dev->bdaddr,
 							HCI_REQ_TIMEOUT) < 0) {
-			error("Read remote name cancel failed: %s, (%d)",
-					strerror(errno), errno);
 			err = -errno;
+			error("Read remote name cancel failed: %s, (%d)",
+						strerror(errno), errno);
 		}
 	} else {
 		if (inquiry_cancel(dd, HCI_REQ_TIMEOUT) < 0) {
-			error("Inquiry cancel failed:%s (%d)",
-					strerror(errno), errno);
 			err = -errno;
+			error("Inquiry cancel failed:%s (%d)",
+						strerror(errno), errno);
 		}
 	}
 
@@ -1447,19 +1447,19 @@ int cancel_periodic_discovery(struct btd_adapter *adapter)
 	dev = adapter_search_found_devices(adapter, &match);
 	if (dev) {
 		if (remote_name_cancel(dd, &dev->bdaddr,
-							HCI_REQ_TIMEOUT) < 0) {
-			error("Read remote name cancel failed: %s, (%d)",
-					strerror(errno), errno);
+						HCI_REQ_TIMEOUT) < 0) {
 			err = -errno;
+			error("Read remote name cancel failed: %s, (%d)",
+						strerror(errno), errno);
 		}
 	}
 
 	/* ovewrite err if necessary: stop periodic inquiry has higher
 	 * priority */
 	if (periodic_inquiry_exit(dd, HCI_REQ_TIMEOUT) < 0) {
-		error("Periodic Inquiry exit failed:%s (%d)",
-				strerror(errno), errno);
 		err = -errno;
+		error("Periodic Inquiry exit failed:%s (%d)",
+						strerror(errno), errno);
 	}
 
 	hci_close_dev(dd);