>>From 66048184e4d7c88afae449236a2e62ef352c4438 Mon Sep 17 00:00:00 2001 From: Fabien Chevalier Date: Sat, 13 Sep 2008 17:11:08 +0200 Subject: [PATCH] Error code fixes In case of socket errors, we used to return a positive value where the convention is to return negative values only : fix that --- audio/avdtp.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/audio/avdtp.c b/audio/avdtp.c index 592322f..bf5c0d3 100644 --- a/audio/avdtp.c +++ b/audio/avdtp.c @@ -489,7 +489,7 @@ static gboolean disconnect_timeout(gpointer user_data) session->dc_timer = 0; - connection_lost(session, -ETIMEDOUT); + connection_lost(session, ETIMEDOUT); return FALSE; } @@ -728,7 +728,7 @@ static void finalize_discovery(struct avdtp *session, int err) { struct avdtp_error avdtp_err; - avdtp_error_init(&avdtp_err, AVDTP_ERROR_ERRNO, -err); + avdtp_error_init(&avdtp_err, AVDTP_ERROR_ERRNO, err); if (!session->discov_cb) return; @@ -1380,7 +1380,7 @@ static gboolean avdtp_parse_cmd(struct avdtp *session, debug("Received DISCOVER_CMD"); return avdtp_discover_cmd(session, (void *) header, size); case AVDTP_GET_CAPABILITIES: - debug("Received GET_CAPABILITIES_CMD"); + debug("Received GET_CAPABILITIES_CMD"); return avdtp_getcap_cmd(session, (void *) header, size); case AVDTP_SET_CONFIGURATION: debug("Received SET_CONFIGURATION_CMD"); @@ -1519,7 +1519,7 @@ static gboolean session_cb(GIOChannel *chan, GIOCondition cond, return TRUE; failed: - connection_lost(session, -EIO); + connection_lost(session, EIO); return FALSE; } @@ -1559,9 +1559,9 @@ static void l2cap_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src, len = sizeof(l2o); if (getsockopt(sk, SOL_L2CAP, L2CAP_OPTIONS, &l2o, &len) < 0) { - err = errno; - error("getsockopt(L2CAP_OPTIONS): %s (%d)", strerror(err), - err); + err = -errno; + error("getsockopt(L2CAP_OPTIONS): %s (%d)", strerror(-err), + -err); goto failed; } @@ -1710,7 +1710,7 @@ static gboolean request_timeout(gpointer user_data) goto done; failed: - connection_lost(session, -ETIMEDOUT); + connection_lost(session, ETIMEDOUT); done: pending_req_free(req); return FALSE; @@ -2716,7 +2716,7 @@ static void auth_cb(DBusError *derr, void *user_data) if (derr && dbus_error_is_set(derr)) { error("Access denied: %s", derr->message); - connection_lost(session, -EACCES); + connection_lost(session, EACCES); return; } -- 1.5.6.5