From 0ff45df8546775bb920a98a2b0ecd76b84ebc20a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 1 Jul 2025 12:14:22 +0200
Subject: [PATCH] error: Rename device error helper to match retval

Rename the helper to show that it outputs a string, and not an error
DbusMessage as the other functions do.
---
 src/device.c | 11 +++++------
 src/error.c  |  8 ++++----
 src/error.h  |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/device.c b/src/device.c
index e4d5d79ee..fd6e5b05b 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2341,7 +2341,7 @@ done:
 
 		g_dbus_send_message(dbus_conn,
 			btd_error_failed(dev->connect,
-					btd_error_bredr_conn_from_errno(err)));
+						btd_error_bredr_str(err)));
 	} else {
 		/* Start passive SDP discovery to update known services */
 		if (dev->bredr && !dev->svc_refreshed && dev->refresh_discovery)
@@ -2698,8 +2698,7 @@ static DBusMessage *connect_profiles(struct btd_device *dev, uint8_t bdaddr_type
 	if (err < 0) {
 		if (err == -EALREADY)
 			return dbus_message_new_method_return(msg);
-		return btd_error_failed(msg,
-					btd_error_bredr_conn_from_errno(err));
+		return btd_error_failed(msg, btd_error_bredr_str(err));
 	}
 
 	dev->connect = dbus_message_ref(msg);
@@ -3004,8 +3003,8 @@ static void browse_request_complete(struct browse_req *req, uint8_t type,
 		}
 		reply = btd_error_failed(req->msg,
 				bdaddr_type == BDADDR_BREDR ?
-				btd_error_bredr_conn_from_errno(err) :
-				btd_error_le_conn_from_errno(err));
+				btd_error_bredr_str(err) :
+				btd_error_le_str(err));
 		goto done;
 	}
 
@@ -6283,7 +6282,7 @@ done:
 	if (device->connect) {
 		if (err < 0)
 			reply = btd_error_failed(device->connect,
-					btd_error_le_conn_from_errno(err));
+						btd_error_le_str(err));
 		else
 			reply = dbus_message_new_method_return(device->connect);
 
diff --git a/src/error.c b/src/error.c
index f179e6cda..3aa8efabe 100644
--- a/src/error.c
+++ b/src/error.c
@@ -134,9 +134,9 @@ DBusMessage *btd_error_failed(DBusMessage *msg, const char *str)
 					".Failed", "%s", str);
 }
 
-const char *btd_error_bredr_conn_from_errno(int errno_code)
+const char *btd_error_bredr_str(int err)
 {
-	switch (-errno_code) {
+	switch (-err) {
 	case EALREADY:
 	case EISCONN:
 		return ERR_BREDR_CONN_ALREADY_CONNECTED;
@@ -178,9 +178,9 @@ const char *btd_error_bredr_conn_from_errno(int errno_code)
 	}
 }
 
-const char *btd_error_le_conn_from_errno(int errno_code)
+const char *btd_error_le_str(int err)
 {
-	switch (-errno_code) {
+	switch (-err) {
 	case EINVAL:
 		return ERR_LE_CONN_INVALID_ARGUMENTS;
 	case EHOSTUNREACH:
diff --git a/src/error.h b/src/error.h
index 83206cb48..1b4e45cb1 100644
--- a/src/error.h
+++ b/src/error.h
@@ -87,5 +87,5 @@ DBusMessage *btd_error_not_ready(DBusMessage *msg);
 DBusMessage *btd_error_not_ready_str(DBusMessage *msg, const char *str);
 DBusMessage *btd_error_failed(DBusMessage *msg, const char *str);
 
-const char *btd_error_bredr_conn_from_errno(int errno_code);
-const char *btd_error_le_conn_from_errno(int errno_code);
+const char *btd_error_bredr_str(int err);
+const char *btd_error_le_str(int errn);
-- 
2.47.3