diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-04-02 14:04:39 +0300 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-04-02 14:06:53 +0300 |
commit | ccd67f611c7f22bee09437deec0f5c2653d5c94c (patch) | |
tree | 3e3730151a54510f7f67583140a8ba12443ddd8b /btio/btio.c | |
parent | 8dec0f65b4b2c29729959feabc053c38e6922efc (diff) | |
download | bluez-ccd67f611c7f22bee09437deec0f5c2653d5c94c.tar.gz |
btio: Remove unnecessary get_peers() function
Diffstat (limited to 'btio/btio.c')
-rw-r--r-- | btio/btio.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/btio/btio.c b/btio/btio.c index 7cacaf054..5f9117100 100644 --- a/btio/btio.c +++ b/btio/btio.c @@ -886,28 +886,6 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err, return TRUE; } -static gboolean get_peers(int sock, struct sockaddr *src, struct sockaddr *dst, - socklen_t len, GError **err) -{ - socklen_t olen; - - memset(src, 0, len); - olen = len; - if (getsockname(sock, src, &olen) < 0) { - ERROR_FAILED(err, "getsockname", errno); - return FALSE; - } - - memset(dst, 0, len); - olen = len; - if (getpeername(sock, dst, &olen) < 0) { - ERROR_FAILED(err, "getpeername", errno); - return FALSE; - } - - return TRUE; -} - static gboolean get_src(int sock, void *src, socklen_t len, GError **err) { socklen_t olen; @@ -1340,8 +1318,10 @@ static gboolean sco_get(int sock, GError **err, BtIOOption opt1, va_list args) return FALSE; } - if (!get_peers(sock, (struct sockaddr *) &src, - (struct sockaddr *) &dst, sizeof(src), err)) + if (!get_src(sock, &src, sizeof(src), err)) + return FALSE; + + if (!get_dst(sock, &dst, sizeof(dst), err)) return FALSE; while (opt != BT_IO_OPT_INVALID) { |