From: Mikel Astiz <mikel.astiz.oss@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Mikel Astiz <mikel.astiz@bmw-carit.de>
Subject: [PATCH obexd 7/9] client: expose obc_transfer_set_callback
Date: Tue, 21 Feb 2012 09:46:21 +0100 [thread overview]
Message-ID: <1329813983-26707-8-git-send-email-mikel.astiz.oss@gmail.com> (raw)
In-Reply-To: <1329813983-26707-1-git-send-email-mikel.astiz.oss@gmail.com>
From: Mikel Astiz <mikel.astiz@bmw-carit.de>
This will allow setting the callback before the transfer is started,
particularly to report queued transfer cancellations.
---
client/session.c | 9 +++++++--
client/transfer.c | 14 +++-----------
client/transfer.h | 10 ++++++----
3 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/client/session.c b/client/session.c
index 50a6a5d..e9cc3ee 100644
--- a/client/session.c
+++ b/client/session.c
@@ -107,6 +107,9 @@ static void session_prepare_put(gpointer data, gpointer user_data);
static void session_terminate_transfer(struct obc_session *session,
struct obc_transfer *transfer,
GError *gerr);
+static void transfer_progress(struct obc_transfer *transfer,
+ gint64 transferred, GError *err,
+ void *user_data);
GQuark obex_io_error_quark(void)
{
@@ -704,6 +707,8 @@ static int session_request(struct obc_session *session,
struct pending_request *p;
int err;
+ obc_transfer_set_callback(transfer, transfer_progress, session);
+
p = pending_request_new(session, transfer, auth_complete, func, data);
if (session->p) {
@@ -877,7 +882,7 @@ static void session_prepare_get(gpointer data, gpointer user_data)
struct obc_transfer *transfer = user_data;
int ret;
- ret = obc_transfer_get(transfer, transfer_progress, session);
+ ret = obc_transfer_get(transfer);
if (ret < 0) {
GError *gerr = NULL;
@@ -1022,7 +1027,7 @@ static void session_prepare_put(gpointer data, gpointer user_data)
struct obc_transfer *transfer = user_data;
int ret;
- ret = obc_transfer_put(transfer, transfer_progress, session);
+ ret = obc_transfer_put(transfer);
if (ret < 0) {
GError *gerr = NULL;
diff --git a/client/transfer.c b/client/transfer.c
index 4054799..2cf5786 100644
--- a/client/transfer.c
+++ b/client/transfer.c
@@ -488,7 +488,7 @@ static gssize put_xfer_progress(void *buf, gsize len, gpointer user_data)
return size;
}
-static void obc_transfer_set_callback(struct obc_transfer *transfer,
+void obc_transfer_set_callback(struct obc_transfer *transfer,
transfer_callback_t func,
void *user_data)
{
@@ -503,8 +503,7 @@ static void obc_transfer_set_callback(struct obc_transfer *transfer,
transfer->callback = callback;
}
-int obc_transfer_get(struct obc_transfer *transfer, transfer_callback_t func,
- void *user_data)
+int obc_transfer_get(struct obc_transfer *transfer)
{
GError *err = NULL;
GObexPacket *req;
@@ -558,14 +557,10 @@ int obc_transfer_get(struct obc_transfer *transfer, transfer_callback_t func,
if (transfer->xfer == 0)
return -ENOTCONN;
- if (func)
- obc_transfer_set_callback(transfer, func, user_data);
-
return 0;
}
-int obc_transfer_put(struct obc_transfer *transfer, transfer_callback_t func,
- void *user_data)
+int obc_transfer_put(struct obc_transfer *transfer)
{
GError *err = NULL;
GObexPacket *req;
@@ -606,9 +601,6 @@ done:
if (transfer->xfer == 0)
return -ENOTCONN;
- if (func)
- obc_transfer_set_callback(transfer, func, user_data);
-
return 0;
}
diff --git a/client/transfer.h b/client/transfer.h
index e5387fc..348c17c 100644
--- a/client/transfer.h
+++ b/client/transfer.h
@@ -42,10 +42,12 @@ struct obc_transfer *obc_transfer_register(DBusConnection *conn,
void obc_transfer_unregister(struct obc_transfer *transfer);
-int obc_transfer_get(struct obc_transfer *transfer, transfer_callback_t func,
- void *user_data);
-int obc_transfer_put(struct obc_transfer *transfer, transfer_callback_t func,
- void *user_data);
+void obc_transfer_set_callback(struct obc_transfer *transfer,
+ transfer_callback_t func,
+ void *user_data);
+
+int obc_transfer_get(struct obc_transfer *transfer);
+int obc_transfer_put(struct obc_transfer *transfer);
int obc_transfer_get_params(struct obc_transfer *transfer,
struct obc_transfer_params *params);
--
1.7.6.5
next prev parent reply other threads:[~2012-02-21 8:46 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-21 8:46 [PATCH obexd 0/9] Transfer cancelation Mikel Astiz
2012-02-21 8:46 ` [PATCH obexd 1/9] gobex: fix callback remove when canceling transfer Mikel Astiz
2012-02-21 11:02 ` Luiz Augusto von Dentz
2012-02-21 11:16 ` Luiz Augusto von Dentz
2012-02-21 8:46 ` [PATCH obexd 2/9] client: fix obc_session_get_buffer Mikel Astiz
2012-02-21 11:07 ` Luiz Augusto von Dentz
2012-02-21 8:46 ` [PATCH obexd 3/9] client: deny cancel when no agent present Mikel Astiz
2012-02-21 11:12 ` Luiz Augusto von Dentz
2012-02-21 8:46 ` [PATCH obexd 4/9] client: remove unnecessary code Mikel Astiz
2012-02-21 11:27 ` Luiz Augusto von Dentz
2012-02-21 8:46 ` [PATCH obexd 5/9] client: process transfer queue only if none active Mikel Astiz
2012-02-21 8:46 ` [PATCH obexd 6/9] client: terminate queued transfers properly Mikel Astiz
2012-02-21 11:40 ` Luiz Augusto von Dentz
2012-02-21 8:46 ` Mikel Astiz [this message]
2012-02-21 11:51 ` [PATCH obexd 7/9] client: expose obc_transfer_set_callback Luiz Augusto von Dentz
2012-02-21 8:46 ` [PATCH obexd 8/9] client: allow cancelling queued transfers Mikel Astiz
2012-02-21 11:56 ` Luiz Augusto von Dentz
2012-02-21 8:46 ` [PATCH obexd 9/9] client: make sure callback does not match size Mikel Astiz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329813983-26707-8-git-send-email-mikel.astiz.oss@gmail.com \
--to=mikel.astiz.oss@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=mikel.astiz@bmw-carit.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).