2012-04-30 11:02:21

by Jaganath Kanakkassery

Subject: [PATCH obexd 1/3] gobex: Add callback and userdata parameter to g_obex_cancel_transfer()

If callback is provided in g_obex_cancel_transfer() current complete
callback will be replaced by the new one and user will be informed
when abort completes.
---
gobex/gobex-transfer.c | 17 +++++++++++++++--
gobex/gobex.c | 4 ++--
gobex/gobex.h | 5 ++++-
3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/gobex/gobex-transfer.c b/gobex/gobex-transfer.c
index c62a91e..1627e9d 100644
--- a/gobex/gobex-transfer.c
+++ b/gobex/gobex-transfer.c
@@ -624,9 +624,11 @@ guint g_obex_get_rsp(GObex *obex, GObexDataProducer data_func,
user_data, err);
}

-gboolean g_obex_cancel_transfer(guint id)
+gboolean g_obex_cancel_transfer(guint id, GObexFunc complete_func,
+ gpointer user_data)
{
struct transfer *transfer = NULL;
+ gboolean ret = TRUE;

g_obex_debug(G_OBEX_DEBUG_TRANSFER, "transfer %u", id);

@@ -635,6 +637,17 @@ gboolean g_obex_cancel_transfer(guint id)
if (transfer == NULL)
return FALSE;

- transfer_free(transfer);
+ if (complete_func == NULL)
+ goto free;
+
+ transfer->complete_func = complete_func;
+ transfer->user_data = user_data;
+ if ((ret = g_obex_pending_req_abort(transfer->obex, NULL)) == FALSE)
+ goto free;
+
return TRUE;
+
+free:
+ transfer_free(transfer);
+ return ret;
}
diff --git a/gobex/gobex.c b/gobex/gobex.c
index f31b733..b20542d 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -684,7 +684,7 @@ static gint pending_pkt_cmp(gconstpointer a, gconstpointer b)
return (p->id - id);
}

-static gboolean pending_req_abort(GObex *obex, GError **err)
+gboolean g_obex_pending_req_abort(GObex *obex, GError **err)
{
struct pending_pkt *p = obex->pending_req;
GObexPacket *req;
@@ -728,7 +728,7 @@ gboolean g_obex_cancel_req(GObex *obex, guint req_id, gboolean remove_callback)
struct pending_pkt *p;

if (obex->pending_req && obex->pending_req->id == req_id) {
- if (!pending_req_abort(obex, NULL)) {
+ if (!g_obex_pending_req_abort(obex, NULL)) {
p = obex->pending_req;
obex->pending_req = NULL;
goto immediate_completion;
diff --git a/gobex/gobex.h b/gobex/gobex.h
index aacdb53..8cbabb6 100644
--- a/gobex/gobex.h
+++ b/gobex/gobex.h
@@ -49,6 +49,8 @@ guint g_obex_send_req(GObex *obex, GObexPacket *req, gint timeout,
gboolean g_obex_cancel_req(GObex *obex, guint req_id,
gboolean remove_callback);

+gboolean g_obex_pending_req_abort(GObex *obex, GError **err);
+
gboolean g_obex_send_rsp(GObex *obex, guint8 rspcode, GError **err,
guint8 first_hdr_type, ...);

@@ -122,7 +124,8 @@ guint g_obex_get_rsp_pkt(GObex *obex, GObexPacket *rsp,
GObexDataProducer data_func, GObexFunc complete_func,
gpointer user_data, GError **err);

-gboolean g_obex_cancel_transfer(guint id);
+gboolean g_obex_cancel_transfer(guint id, GObexFunc complete_func,
+ gpointer user_data);

const char *g_obex_strerror(guint8 err_code);
guint8 g_obex_errno_to_rsp(int err);
--
1.7.1

2012-05-02 13:27:33

by Jaganath Kanakkassery

Subject: Re: [PATCH obexd 1/3] gobex: Add callback and userdata parameter to g_obex_cancel_transfer()

Hi Luiz,

--------------------------------------------------
From: "Luiz Augusto von Dentz" <[email protected]>
Sent: Wednesday, May 02, 2012 6:02 PM
To: "Jaganath Kanakkassery" <[email protected]>
Cc: <[email protected]>
Subject: Re: [PATCH obexd 1/3] gobex: Add callback and userdata parameter to
g_obex_cancel_transfer()

> Hi Jaganath,
>
> On Mon, Apr 30, 2012 at 2:02 PM, Jaganath Kanakkassery
> <[email protected]> wrote:
>> +free:
>> + transfer_free(transfer);
>> + return ret;
>> }
>
> Just be completely save here name the label something else than free
> (e.g. done).

Ok, I will rename it to done and send patch.

Thanks,
Jaganath

2012-05-02 12:32:04

by Luiz Augusto von Dentz

Subject: Re: [PATCH obexd 1/3] gobex: Add callback and userdata parameter to g_obex_cancel_transfer()

Hi Jaganath,

On Mon, Apr 30, 2012 at 2:02 PM, Jaganath Kanakkassery
<[email protected]> wrote:
> +free:
> + ? ? ? transfer_free(transfer);
> + ? ? ? return ret;
> ?}

Just be completely save here name the label something else than free
(e.g. done).

--
Luiz Augusto von Dentz