Return-Path: From: Waldemar Rymarkiewicz To: Johan Hedberg CC: , Waldemar Rymarkiewicz Subject: [PATCH v3 2/4] Fix return value in send_message Date: Tue, 31 May 2011 12:46:48 +0200 Message-ID: <1306838810-18325-2-git-send-email-waldemar.rymarkiewicz@tieto.com> In-Reply-To: <1306838810-18325-1-git-send-email-waldemar.rymarkiewicz@tieto.com> References: <1306838810-18325-1-git-send-email-waldemar.rymarkiewicz@tieto.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-bluetooth-owner@vger.kernel.org List-ID: send_message returns the number of sent bytes and -EIO in case of IO error now --- sap/server.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sap/server.c b/sap/server.c index c5ea97c..aa8ba23 100644 --- a/sap/server.c +++ b/sap/server.c @@ -254,7 +254,7 @@ static int send_message(struct sap_connection *conn, void *buf, size_t size) if (!conn || !buf) return -EINVAL; - DBG("size %zu", size); + DBG("conn %p, size %zu", conn, size); gstatus = g_io_channel_write_chars(conn->io, buf, size, &written, &gerr); @@ -263,13 +263,15 @@ static int send_message(struct sap_connection *conn, void *buf, size_t size) g_error_free(gerr); error("write error (0x%02x).", gstatus); - return -EINVAL; + return -EIO; } - if (written != size) - error("write error.(written %zu size %zu)", written, size); + if (written != size) { + error("written %zu bytes out of %zu", written, size); + return -EIO; + } - return 0; + return written; } static int disconnect_ind(void *sap_device, uint8_t disc_type) -- 1.7.4.1