korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-15 08:14:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

btio: Fix the return value of bt_io functions

Browse Source 
Some bt_io methods were ignoring the value stored in errno when
reporting the error to the caller.
This commit is contained in:
Vinicius Costa Gomes 2011-07-05 14:00:00 -03:00 committed by Johan Hedberg
parent e1d2db4976
commit c141fcc366
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
btio/btio.c
View File

@ -271,8 +271,9 @@ static int l2cap_bind(int sock, const bdaddr_t *src, uint16_t psm,
addr.l2_psm = htobs(psm);
if (bind(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
int error = -errno;
ERROR_FAILED(err, "l2cap_bind", errno);
return -1;
return error;
}
return 0;
@ -294,7 +295,7 @@ static int l2cap_connect(int sock, const bdaddr_t *dst,
err = connect(sock, (struct sockaddr *) &addr, sizeof(addr));
if (err < 0 && !(errno == EAGAIN || errno == EINPROGRESS))
return err;
return -errno;
return 0;
}
@ -558,8 +559,9 @@ static int rfcomm_bind(int sock,
addr.rc_channel = channel;
if (bind(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
int error = -errno;
ERROR_FAILED(err, "rfcomm_bind", errno);
return -1;
return error;
}
return 0;
@ -577,7 +579,7 @@ static int rfcomm_connect(int sock, const bdaddr_t *dst, uint8_t channel)
err = connect(sock, (struct sockaddr *) &addr, sizeof(addr));
if (err < 0 && !(errno == EAGAIN || errno == EINPROGRESS))
return err;
return -errno;
return 0;
}
@ -604,8 +606,9 @@ static int sco_bind(int sock, const bdaddr_t *src, GError **err)
bacpy(&addr.sco_bdaddr, src);
if (bind(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
int error = -errno;
ERROR_FAILED(err, "sco_bind", errno);
return -1;
return error;
}
return 0;
@ -622,7 +625,7 @@ static int sco_connect(int sock, const bdaddr_t *dst)
err = connect(sock, (struct sockaddr *) &addr, sizeof(addr));
if (err < 0 && !(errno == EAGAIN || errno == EINPROGRESS))
return err;
return -errno;
return 0;
}