From: Anderson Lizardo <anderson.lizardo@openbossa.org>
To: linux-bluetooth@vger.kernel.org
Cc: Anderson Lizardo <anderson.lizardo@openbossa.org>
Subject: [PATCH BlueZ 10/17] sdp-client: Fix errno handling convention
Date: Wed, 16 Nov 2011 09:19:57 -0400 [thread overview]
Message-ID: <1321449604-4188-11-git-send-email-anderson.lizardo@openbossa.org> (raw)
In-Reply-To: <1321449604-4188-1-git-send-email-anderson.lizardo@openbossa.org>
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.
---
src/sdp-client.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/sdp-client.c b/src/sdp-client.c
index ebd760e..f119313 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);
--
1.7.0.4
next prev parent reply other threads:[~2011-11-16 13:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-16 13:19 [PATCH BlueZ 00/17] Fix errno handling convention Anderson Lizardo
2011-11-16 13:19 ` [PATCH BlueZ 01/17] AVCTP: " Anderson Lizardo
2011-11-16 13:19 ` [PATCH BlueZ 02/17] AVDTP: " Anderson Lizardo
2011-11-16 13:19 ` [PATCH BlueZ 03/17] audio/IPC: " Anderson Lizardo
2011-11-16 13:19 ` [PATCH BlueZ 04/17] audio/PCM: " Anderson Lizardo
2011-11-16 13:19 ` [PATCH BlueZ 05/17] audio: " Anderson Lizardo
2011-11-16 13:19 ` [PATCH BlueZ 06/17] serial: " Anderson Lizardo
2011-11-16 13:19 ` [PATCH BlueZ 07/17] hcitool: " Anderson Lizardo
2011-11-16 13:19 ` [PATCH BlueZ 08/17] hciconfig: " Anderson Lizardo
2011-11-24 5:58 ` Regarding MAP status Jaganath
2011-11-16 13:19 ` [PATCH BlueZ 09/17] textfile: Fix errno handling convention Anderson Lizardo
2011-11-16 13:19 ` Anderson Lizardo [this message]
2011-11-16 13:19 ` [PATCH BlueZ 11/17] sap-u8500: " Anderson Lizardo
2011-11-16 13:19 ` [PATCH BlueZ 12/17] network: " Anderson Lizardo
2011-11-16 13:20 ` [PATCH BlueZ 13/17] input: " Anderson Lizardo
2011-11-16 13:20 ` [PATCH BlueZ 14/17] btio: " Anderson Lizardo
2011-11-16 13:20 ` [PATCH BlueZ 15/17] bccmd: Fix overwriting errno value Anderson Lizardo
2011-11-16 13:20 ` [PATCH BlueZ 16/17] csr_bcsp: Fix missing errno attribution Anderson Lizardo
2011-11-16 13:20 ` [PATCH BlueZ 17/17] Fix return value check for bt_audio_service_open() Anderson Lizardo
2011-11-17 11:58 ` [PATCH BlueZ 00/17] Fix errno handling convention Johan Hedberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1321449604-4188-11-git-send-email-anderson.lizardo@openbossa.org \
--to=anderson.lizardo@openbossa.org \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox