* [PATCH] Fix error not being propagated properly
@ 2010-03-05 13:03 Luiz Augusto von Dentz
2010-03-05 13:36 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 3+ messages in thread
From: Luiz Augusto von Dentz @ 2010-03-05 13:03 UTC (permalink / raw)
To: linux-bluetooth
[-- Attachment #1: Type: text/plain, Size: 917 bytes --]
---
audio/headset.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/audio/headset.c b/audio/headset.c
index 0176937..893edd0 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -198,7 +198,7 @@ static DBusHandlerResult
error_connection_attempt_failed(DBusConnection *conn,
{
return error_common_reply(conn, msg,
ERROR_INTERFACE ".ConnectionAttemptFailed",
- err > 0 ? strerror(err) : "Connection attempt failed");
+ err < 0 ? strerror(-err) : "Connection attempt failed");
}
static int rfcomm_connect(struct audio_device *device, headset_stream_cb_t cb,
@@ -435,7 +435,7 @@ static void pending_connect_complete(struct
connect_cb *cb, struct audio_device
{
struct headset *hs = dev->headset;
- if (hs->pending->err)
+ if (hs->pending->err < 0)
cb->cb(NULL, cb->cb_data);
else
cb->cb(dev, cb->cb_data);
--
1.6.3.3
--
Luiz Augusto von Dentz
Computer Engineer
[-- Attachment #2: 0010-Fix-not-emitting-error-properly-when-sco-connection-.patch --]
[-- Type: text/x-patch, Size: 710 bytes --]
From dfcc6b0bfd8ed75630968dbb4967c31f6a0dd39a Mon Sep 17 00:00:00 2001
From: Luiz Augusto Von Dentz <luiz.dentz-von@nokia.com>
Date: Fri, 5 Mar 2010 14:19:58 +0200
Subject: [PATCH 10/11] Fix not emitting error properly when sco connection fails
---
audio/headset.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/audio/headset.c b/audio/headset.c
index 15d3672..0176937 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -573,6 +573,7 @@ static void sco_connect_cb(GIOChannel *chan, GError *err, gpointer user_data)
if (err) {
error("%s", err->message);
+ p->err = -errno;
if (p && p->msg)
error_connection_attempt_failed(dev->conn, p->msg, p->err);
--
1.6.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix error not being propagated properly
2010-03-05 13:03 [PATCH] Fix error not being propagated properly Luiz Augusto von Dentz
@ 2010-03-05 13:36 ` Luiz Augusto von Dentz
2010-03-22 11:11 ` Johan Hedberg
0 siblings, 1 reply; 3+ messages in thread
From: Luiz Augusto von Dentz @ 2010-03-05 13:36 UTC (permalink / raw)
To: linux-bluetooth
[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]
Now with the correct patch attached
On Fri, Mar 5, 2010 at 3:03 PM, Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
> ---
> audio/headset.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/audio/headset.c b/audio/headset.c
> index 0176937..893edd0 100644
> --- a/audio/headset.c
> +++ b/audio/headset.c
> @@ -198,7 +198,7 @@ static DBusHandlerResult
> error_connection_attempt_failed(DBusConnection *conn,
> {
> return error_common_reply(conn, msg,
> ERROR_INTERFACE ".ConnectionAttemptFailed",
> - err > 0 ? strerror(err) : "Connection attempt failed");
> + err < 0 ? strerror(-err) : "Connection attempt failed");
> }
>
> static int rfcomm_connect(struct audio_device *device, headset_stream_cb_t cb,
> @@ -435,7 +435,7 @@ static void pending_connect_complete(struct
> connect_cb *cb, struct audio_device
> {
> struct headset *hs = dev->headset;
>
> - if (hs->pending->err)
> + if (hs->pending->err < 0)
> cb->cb(NULL, cb->cb_data);
> else
> cb->cb(dev, cb->cb_data);
> --
> 1.6.3.3
>
>
> --
> Luiz Augusto von Dentz
> Computer Engineer
>
--
Luiz Augusto von Dentz
Computer Engineer
[-- Attachment #2: 0011-Fix-error-not-being-propagated-properly.patch --]
[-- Type: text/x-patch, Size: 1101 bytes --]
From 5dd57c233aa881faeaa6bfca147abcdb9e04dc93 Mon Sep 17 00:00:00 2001
From: Luiz Augusto Von Dentz <luiz.dentz-von@nokia.com>
Date: Fri, 5 Mar 2010 15:01:59 +0200
Subject: [PATCH 11/11] Fix error not being propagated properly
---
audio/headset.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/audio/headset.c b/audio/headset.c
index 0176937..893edd0 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -198,7 +198,7 @@ static DBusHandlerResult error_connection_attempt_failed(DBusConnection *conn,
{
return error_common_reply(conn, msg,
ERROR_INTERFACE ".ConnectionAttemptFailed",
- err > 0 ? strerror(err) : "Connection attempt failed");
+ err < 0 ? strerror(-err) : "Connection attempt failed");
}
static int rfcomm_connect(struct audio_device *device, headset_stream_cb_t cb,
@@ -435,7 +435,7 @@ static void pending_connect_complete(struct connect_cb *cb, struct audio_device
{
struct headset *hs = dev->headset;
- if (hs->pending->err)
+ if (hs->pending->err < 0)
cb->cb(NULL, cb->cb_data);
else
cb->cb(dev, cb->cb_data);
--
1.6.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix error not being propagated properly
2010-03-05 13:36 ` Luiz Augusto von Dentz
@ 2010-03-22 11:11 ` Johan Hedberg
0 siblings, 0 replies; 3+ messages in thread
From: Johan Hedberg @ 2010-03-22 11:11 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
On Fri, Mar 05, 2010, Luiz Augusto von Dentz wrote:
> Now with the correct patch attached
>
> From 5dd57c233aa881faeaa6bfca147abcdb9e04dc93 Mon Sep 17 00:00:00 2001
> From: Luiz Augusto Von Dentz <luiz.dentz-von@nokia.com>
> Date: Fri, 5 Mar 2010 15:01:59 +0200
> Subject: [PATCH 11/11] Fix error not being propagated properly
>
> ---
> audio/headset.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
The first patch had some issues so I pushed my own fixed up version of
it. However, this second patch from you is now pushed (unchanged)
upstream.
Johan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-22 11:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-03-05 13:03 [PATCH] Fix error not being propagated properly Luiz Augusto von Dentz
2010-03-05 13:36 ` Luiz Augusto von Dentz
2010-03-22 11:11 ` Johan Hedberg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.