korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2025-01-26 22:33:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

btio: Fix errno handling convention

Browse Source 
Variables which are assigned to the errno variable (usually called
"err") should be negative, and "-err" should be used where a positive
value is needed.
This commit is contained in:
Anderson Lizardo 2011-11-16 09:20:01 -04:00 committed by Johan Hedberg
parent fb84461539
commit 467fcb8094
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
btio/btio.c
View File

@ -153,16 +153,18 @@ static gboolean connect_cb(GIOChannel *io, GIOCondition cond,
return FALSE;
if (cond & G_IO_OUT) {
int err = 0, sock = g_io_channel_unix_get_fd(io);
socklen_t len = sizeof(err);
int err, sk_err = 0, sock = g_io_channel_unix_get_fd(io);
socklen_t len = sizeof(sk_err);
if (getsockopt(sock, SOL_SOCKET, SO_ERROR, &err, &len) < 0)
err = errno;
if (getsockopt(sock, SOL_SOCKET, SO_ERROR, &sk_err, &len) < 0)
err = -errno;
else
err = -sk_err;
if (err)
if (err < 0)
g_set_error(&gerr, BT_IO_ERROR,
BT_IO_ERROR_CONNECT_FAILED, "%s (%d)",
strerror(err), err);
strerror(-err), -err);
} else if (cond & (G_IO_HUP | G_IO_ERR))
g_set_error(&gerr, BT_IO_ERROR, BT_IO_ERROR_CONNECT_FAILED,
"HUP or ERR on socket");