aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnderson Lizardo <anderson.lizardo@openbossa.org>2011-11-16 09:19:57 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2011-11-17 13:57:53 +0200
commit5a1fd2f1a8811db4fa9e9f1bf78bbb59f53d3d12 (patch)
tree1b59d87e3ca0b36dde2b48877c038e70c51141bc
parent1d5d9cc82614c70a1d4a6177d5de3dbb552b601a (diff)
downloadbluez-5a1fd2f1a8811db4fa9e9f1bf78bbb59f53d3d12.tar.gz
bluez-5a1fd2f1a8811db4fa9e9f1bf78bbb59f53d3d12.tar.xz
bluez-5a1fd2f1a8811db4fa9e9f1bf78bbb59f53d3d12.zip
sdp-client: Fix errno handling convention
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.
-rw-r--r--src/sdp-client.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/sdp-client.c b/src/sdp-client.c
index ebd760e2..f1193138 100644
--- a/src/sdp-client.c
+++ b/src/sdp-client.c
@@ -217,22 +217,22 @@ static gboolean connect_watch(GIOChannel *chan, GIOCondition cond,
sdp_list_t *search, *attrids;
uint32_t range = 0x0000ffff;
socklen_t len;
- int sk, err = 0;
+ int sk, err, sk_err = 0;
sk = g_io_channel_unix_get_fd(chan);
ctxt->io_id = 0;
- len = sizeof(err);
- if (getsockopt(sk, SOL_SOCKET, SO_ERROR, &err, &len) < 0) {
- err = errno;
- goto failed;
- }
+ len = sizeof(sk_err);
+ if (getsockopt(sk, SOL_SOCKET, SO_ERROR, &sk_err, &len) < 0)
+ err = -errno;
+ else
+ err = -sk_err;
if (err != 0)
goto failed;
if (sdp_set_notify(ctxt->session, search_completed_cb, ctxt) < 0) {
- err = EIO;
+ err = -EIO;
goto failed;
}
@@ -242,7 +242,7 @@ static gboolean connect_watch(GIOChannel *chan, GIOCondition cond,
search, SDP_ATTR_REQ_RANGE, attrids) < 0) {
sdp_list_free(attrids, NULL);
sdp_list_free(search, NULL);
- err = EIO;
+ err = -EIO;
goto failed;
}
@@ -260,7 +260,7 @@ failed:
ctxt->session = NULL;
if (ctxt->cb)
- ctxt->cb(NULL, -err, ctxt->user_data);
+ ctxt->cb(NULL, err, ctxt->user_data);
search_context_cleanup(ctxt);