From f3636d08a1e0b344eb9e9021fe0abe3f4342ce99 Mon Sep 17 00:00:00 2001 From: Mikel Astiz Date: Tue, 24 Apr 2012 15:03:11 +0300 Subject: [PATCH] obexd: remove unused field The errorcode field is set but never used, so it can safely be removed. In addition there is no need for such a field, because errors can be propagated using the available callback. --- obexd/client/transfer.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c index ac5f27e2a..8ba5381c5 100644 --- a/obexd/client/transfer.c +++ b/obexd/client/transfer.c @@ -67,7 +67,6 @@ struct obc_transfer { guint xfer; gint64 size; gint64 transferred; - int err; }; static GQuark obc_transfer_error_quark(void) @@ -288,10 +287,8 @@ static gboolean get_xfer_progress(const void *buf, gsize len, gint w; w = write(transfer->fd, buf, len); - if (w < 0) { - transfer->err = -errno; + if (w < 0) return FALSE; - } transfer->transferred += w; } @@ -310,10 +307,8 @@ static void xfer_complete(GObex *obex, GError *err, gpointer user_data) transfer->xfer = 0; - if (err) { - transfer->err = err->code; + if (err) goto done; - } transfer->size = transfer->transferred; @@ -390,10 +385,8 @@ static gssize put_xfer_progress(void *buf, gsize len, gpointer user_data) gssize size; size = read(transfer->fd, buf, len); - if (size <= 0) { - transfer->err = -errno; + if (size <= 0) return size; - } if (callback) callback->func(transfer, transfer->transferred, NULL, -- 2.47.3