From 97e3051ec51ac5bdcb37a371249360163eaf5709 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Thu, 25 Jan 2007 17:27:52 +0000 Subject: set_nonblocking: removed err argument --- audio/headset.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'audio') diff --git a/audio/headset.c b/audio/headset.c index 55a47e8e..cb33f149 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -697,8 +697,10 @@ static int rfcomm_connect(struct headset *hs, int *err) goto failed; } - if (set_nonblocking(sk, err) < 0) + if (set_nonblocking(sk) < 0) { + *err = errno; goto failed; + } memset(&addr, 0, sizeof(addr)); addr.rc_family = AF_BLUETOOTH; @@ -1367,7 +1369,8 @@ static DBusHandlerResult hs_play(struct headset *hs, DBusMessage *msg) goto failed; } - if (set_nonblocking(sk, &err) < 0) { + if (set_nonblocking(sk) < 0) { + err = errno; err_connect_failed(connection, msg, err); goto failed; } -- cgit