From: Anderson Lizardo <anderson.lizardo@openbossa.org>
To: linux-bluetooth@vger.kernel.org
Cc: Anderson Lizardo <anderson.lizardo@openbossa.org>
Subject: [PATCH BlueZ 03/17] audio/IPC: Fix errno handling convention
Date: Wed, 16 Nov 2011 09:19:50 -0400 [thread overview]
Message-ID: <1321449604-4188-4-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.
This commit also changes places where errno can be replaced with -err
(for consistency) and one perror() usage error.
---
audio/ipc.c | 18 +++++++++---------
test/ipctest.c | 12 ++++++++----
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/audio/ipc.c b/audio/ipc.c
index 669eeef..02d956b 100644
--- a/audio/ipc.c
+++ b/audio/ipc.c
@@ -56,19 +56,19 @@ int bt_audio_service_open(void)
sk = socket(PF_LOCAL, SOCK_STREAM, 0);
if (sk < 0) {
- err = errno;
+ err = -errno;
fprintf(stderr, "%s: Cannot open socket: %s (%d)\n",
- __FUNCTION__, strerror(err), err);
- errno = err;
+ __FUNCTION__, strerror(-err), -err);
+ errno = -err;
return -1;
}
if (connect(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- err = errno;
+ err = -errno;
fprintf(stderr, "%s: connect() failed: %s (%d)\n",
- __FUNCTION__, strerror(err), err);
+ __FUNCTION__, strerror(-err), -err);
close(sk);
- errno = err;
+ errno = -err;
return -1;
}
@@ -96,10 +96,10 @@ int bt_audio_service_get_data_fd(int sk)
ret = recvmsg(sk, &msgh, 0);
if (ret < 0) {
- err = errno;
+ err = -errno;
fprintf(stderr, "%s: Unable to receive fd: %s (%d)\n",
- __FUNCTION__, strerror(err), err);
- errno = err;
+ __FUNCTION__, strerror(-err), -err);
+ errno = -err;
return -1;
}
diff --git a/test/ipctest.c b/test/ipctest.c
index 9fdfac4..4968443 100644
--- a/test/ipctest.c
+++ b/test/ipctest.c
@@ -139,7 +139,7 @@ static int service_send(struct userdata *u, const bt_audio_msg_header_t *msg)
else {
err = -errno;
ERR("Error sending data to audio service: %s(%d)",
- strerror(errno), errno);
+ strerror(-err), -err);
}
return err;
@@ -171,7 +171,7 @@ static int service_recv(struct userdata *u, bt_audio_msg_header_t *rsp)
} else {
err = -errno;
ERR("Error receiving data from audio service: %s(%d)",
- strerror(errno), errno);
+ strerror(-err), -err);
}
return err;
@@ -215,8 +215,12 @@ static int init_bt(struct userdata *u)
u->service_fd = bt_audio_service_open();
if (u->service_fd <= 0) {
- perror(strerror(errno));
- return errno;
+ int err = -errno;
+
+ ERR("bt_audio_service_open() failed: %s (%d)", strerror(-err),
+ -err);
+
+ return err;
}
return 0;
--
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 ` Anderson Lizardo [this message]
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 ` [PATCH BlueZ 10/17] sdp-client: " Anderson Lizardo
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-4-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