summaryrefslogtreecommitdiff
path: root/sys/bluez
diff options
context:
space:
mode:
authorAnderson Lizardo <anderson.lizardo@openbossa.org>2011-11-16 09:19:49 -0400
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2013-01-09 14:30:13 +0000
commit86c2797eefae0d5bd9eca6e28e36f63a3524603c (patch)
tree136f525793cee0018b9ebfd6351d14af2151f580 /sys/bluez
parent64c053201734a0ef02f988b69cc0b9207cb281c7 (diff)
downloadgstreamer-plugins-bad-86c2797eefae0d5bd9eca6e28e36f63a3524603c.tar.gz
bluez: AVDTP: 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.
Diffstat (limited to 'sys/bluez')
-rw-r--r--sys/bluez/gstavdtpsink.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/sys/bluez/gstavdtpsink.c b/sys/bluez/gstavdtpsink.c
index 5ab5ca269..9603c1f7f 100644
--- a/sys/bluez/gstavdtpsink.c
+++ b/sys/bluez/gstavdtpsink.c
@@ -282,10 +282,10 @@ gst_avdtp_sink_bluetooth_recvmsg_fd (GstAvdtpSink * sink)
ret = bt_audio_service_get_data_fd (g_io_channel_unix_get_fd (sink->server));
if (ret < 0) {
- err = errno;
+ err = -errno;
GST_ERROR_OBJECT (sink, "Unable to receive fd: %s (%d)",
- strerror (err), err);
- return -err;
+ strerror (-err), -err);
+ return err;
}
sink->stream = g_io_channel_unix_new (ret);
@@ -1441,9 +1441,9 @@ gst_avdtp_sink_start (GstBaseSink * basesink)
sk = bt_audio_service_open ();
if (sk <= 0) {
- err = errno;
+ err = -errno;
GST_ERROR_OBJECT (self, "Cannot open connection to bt "
- "audio service: %s %d", strerror (err), err);
+ "audio service: %s %d", strerror (-err), -err);
goto failed;
}
@@ -1811,7 +1811,7 @@ gst_avdtp_sink_audioservice_send (GstAvdtpSink * self,
ssize_t written;
const char *type, *name;
uint16_t length;
- int fd;
+ int fd, err;
length = msg->length ? msg->length : BT_SUGGESTED_BUFFER_SIZE;
@@ -1819,9 +1819,10 @@ gst_avdtp_sink_audioservice_send (GstAvdtpSink * self,
written = write (fd, msg, length);
if (written < 0) {
+ err = -errno;
GST_ERROR_OBJECT (self, "Error sending data to audio service:"
- " %s", strerror (errno));
- return -errno;
+ " %s", strerror (-err));
+ return err;
}
type = bt_audio_strtype (msg->type);
@@ -1847,9 +1848,10 @@ gst_avdtp_sink_audioservice_recv (GstAvdtpSink * self,
bytes_read = read (fd, inmsg, length);
if (bytes_read < 0) {
+ err = -errno;
GST_ERROR_OBJECT (self, "Error receiving data from "
- "audio service: %s", strerror (errno));
- return -errno;
+ "audio service: %s", strerror (-err));
+ return err;
}
type = bt_audio_strtype (inmsg->type);