diff options
| author | Mikel Astiz <mikel.astiz@bmw-carit.de> | 2012-05-04 14:39:37 +0200 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2012-05-14 11:22:04 +0300 |
| commit | 380b3d70d9e1c528b5bc26c04decb71bfe82d788 (patch) | |
| tree | a2b6ee2c75c1319c954cebb5ac991d1b2bd23e74 | |
| parent | 6a3d8c21da01cd52ae53db19eebcac0bf7b69ba5 (diff) | |
| download | obexd-380b3d70d9e1c528b5bc26c04decb71bfe82d788.tar.gz | |
client: Flip parameter order in transfer API
This minor change makes the transfer API more consistent with the
parameter-order used in the session API.
| -rw-r--r-- | client/session.c | 4 | ||||
| -rw-r--r-- | client/transfer.c | 8 | ||||
| -rw-r--r-- | client/transfer.h | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/client/session.c b/client/session.c index 8523a86..f8f8da4 100644 --- a/client/session.c +++ b/client/session.c @@ -970,7 +970,7 @@ guint obc_session_get(struct obc_session *session, const char *type, return 0; } - transfer = obc_transfer_get(targetfile, name, type, apparam, + transfer = obc_transfer_get(type, name, targetfile, apparam, apparam_size, err); if (transfer == NULL) return 0; @@ -989,7 +989,7 @@ guint obc_session_send(struct obc_session *session, const char *filename, return 0; } - transfer = obc_transfer_put(filename, name, NULL, NULL, 0, NULL, 0, + transfer = obc_transfer_put(NULL, name, filename, NULL, 0, NULL, 0, err); if (transfer == NULL) return 0; diff --git a/client/transfer.c b/client/transfer.c index 2277a95..37963c8 100644 --- a/client/transfer.c +++ b/client/transfer.c @@ -339,9 +339,9 @@ done: return TRUE; } -struct obc_transfer *obc_transfer_get(const char *filename, +struct obc_transfer *obc_transfer_get(const char *type, const char *name, - const char *type, + const char *filename, const void *params, size_t psize, GError **err) { @@ -360,9 +360,9 @@ struct obc_transfer *obc_transfer_get(const char *filename, return transfer; } -struct obc_transfer *obc_transfer_put(const char *filename, +struct obc_transfer *obc_transfer_put(const char *type, const char *name, - const char *type, + const char *filename, const void *contents, size_t csize, const void *params, size_t psize, GError **err) diff --git a/client/transfer.h b/client/transfer.h index aebba7f..94bb800 100644 --- a/client/transfer.h +++ b/client/transfer.h @@ -27,14 +27,14 @@ typedef void (*transfer_callback_t) (struct obc_transfer *transfer, gint64 transferred, GError *err, void *user_data); -struct obc_transfer *obc_transfer_get(const char *filename, +struct obc_transfer *obc_transfer_get(const char *type, const char *name, - const char *type, + const char *filename, const void *params, size_t psize, GError **err); -struct obc_transfer *obc_transfer_put(const char *filename, +struct obc_transfer *obc_transfer_put(const char *type, const char *name, - const char *type, + const char *filename, const void *contents, size_t csize, const void *params, size_t psize, GError **err); |