Skip to contentSkip to conversation

btio: Fix error number

PATCH Applied Pali Rohár 2 participants 2 messages Apr 23, 2020 – Apr 24, 2020 Bluetooth drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btio: Fix error number

In commit d20ee8273e61e16c78582344f274254973cdf00f was unintentionally negated error number. Fix this mistake.

---
 btio/btio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
btio/btio.c +2 -2
index 460aaf5be..13c731062 100644
@@ -230,7 +230,7 @@ static gboolean connect_cb(GIOChannel *io, GIOCondition cond,
 
 	if (err < 0) {
 		ba2str(&conn->dst, addr);
-		g_set_error(&gerr, BT_IO_ERROR, err,
+		g_set_error(&gerr, BT_IO_ERROR, -err,
 			"connect to %s: %s (%d)", addr, strerror(-err), -err);
 	}
 
@@ -1718,7 +1718,7 @@ GIOChannel *bt_io_connect(BtIOConnect connect, gpointer user_data,
 
 	if (err < 0) {
 		ba2str(&opts.dst, addr);
-		g_set_error(gerr, BT_IO_ERROR, err,
+		g_set_error(gerr, BT_IO_ERROR, -err,
 				"connect to %s: %s (%d)", addr, strerror(-err),
 				-err);
 		g_io_channel_unref(io);
Signature · 1 line
2.20.1
maintainer Applied
#1 lore raw

Hi Pali,

Quoted 30 lines · Pali Rohár

In commit d20ee8273e61e16c78582344f274254973cdf00f was unintentionally negated error number. Fix this mistake.

---
 btio/btio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
btio/btio.c +2 -3
index 460aaf5be..13c731062 100644
@@ -230,7 +230,7 @@ static gboolean connect_cb(GIOChannel *io, GIOCondition cond,
 
        if (err < 0) {
                ba2str(&conn->dst, addr);
-               g_set_error(&gerr, BT_IO_ERROR, err,
+               g_set_error(&gerr, BT_IO_ERROR, -err,
                        "connect to %s: %s (%d)", addr, strerror(-err), -err);
        }
 
@@ -1718,7 +1718,7 @@ GIOChannel *bt_io_connect(BtIOConnect connect, gpointer user_data,
 
        if (err < 0) {
                ba2str(&opts.dst, addr);
-               g_set_error(gerr, BT_IO_ERROR, err,
+               g_set_error(gerr, BT_IO_ERROR, -err,
                                "connect to %s: %s (%d)", addr, strerror(-err),
                                -err);
                g_io_channel_unref(io);
--
Quoted 1 line

2.20.1

Applied, thanks.

Signature · 1 line
Luiz Augusto von Dentz