2020-04-23 23:35:02

by Pali Rohár

Subject: [PATCH] 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(-)

diff --git a/btio/btio.c b/btio/btio.c
index 460aaf5be..13c731062 100644
--- a/btio/btio.c
+++ b/btio/btio.c
@@ -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);
--
2.20.1

2020-04-24 17:27:23

by Luiz Augusto von Dentz

Subject: Re: [PATCH] btio: Fix error number

Hi Pali,

On Thu, Apr 23, 2020 at 4:36 PM Pali Rohár <[email protected]> wrote:
>
> In commit d20ee8273e61e16c78582344f274254973cdf00f was unintentionally
> negated error number. Fix this mistake.
> ---
> btio/btio.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/btio/btio.c b/btio/btio.c
> index 460aaf5be..13c731062 100644
> --- a/btio/btio.c
> +++ b/btio/btio.c
> @@ -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);
> --
> 2.20.1

Applied, thanks.

--
Luiz Augusto von Dentz