From ed13e117c186ddaac6ac1ab1978cebe76e2a0a31 Mon Sep 17 00:00:00 2001 From: Vinicius Costa Gomes Date: Wed, 24 Mar 2010 17:09:25 -0300 Subject: [PATCH] obexd: Renaming of obex_prepare_put and obex_stream_start Make the use of these functions more clear, now they are called obex_put_stream_start and obex_get_stream_start, respectively. --- obexd/plugins/ftp.c | 8 ++++---- obexd/plugins/opp.c | 4 ++-- obexd/plugins/pbap.c | 2 +- obexd/plugins/syncevolution.c | 2 +- obexd/src/obex.c | 8 +++++--- obexd/src/obex.h | 5 +++-- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/obexd/plugins/ftp.c b/obexd/plugins/ftp.c index 899d46360..5dfdb53db 100644 --- a/obexd/plugins/ftp.c +++ b/obexd/plugins/ftp.c @@ -162,13 +162,13 @@ static gint get_by_type(struct ftp_session *ftp, const gchar *type) const char *capability = obex_get_capability_path(os); if (type == NULL) - return obex_stream_start(os, ftp->folder, os); + return obex_get_stream_start(os, ftp->folder, os); if (g_str_equal(type, CAP_TYPE)) - return obex_stream_start(os, capability, os); + return obex_get_stream_start(os, capability, os); if (g_str_equal(type, LST_TYPE)) - return obex_stream_start(os, ftp->folder, os); + return obex_get_stream_start(os, ftp->folder, os); return -ENOENT; } @@ -239,7 +239,7 @@ static gint ftp_chkput(struct obex_session *os, gpointer user_data) path = g_build_filename(ftp->folder, name, NULL); - ret = obex_prepare_put(os, path); + ret = obex_put_stream_start(os, path, os); g_free(path); diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c index a28b0e97b..4a29e08bf 100644 --- a/obexd/plugins/opp.c +++ b/obexd/plugins/opp.c @@ -140,7 +140,7 @@ skip_auth: manager_emit_transfer_started(os); - ret = obex_prepare_put(os, path); + ret = obex_put_stream_start(os, path, os); g_free(path); g_free(folder); @@ -177,7 +177,7 @@ static int opp_get(struct obex_session *os, obex_object_t *obj, return -EPERM; if (g_str_equal(type, VCARD_TYPE)) { - if (obex_stream_start(os, VCARD_FILE, NULL) < 0) + if (obex_get_stream_start(os, VCARD_FILE, NULL) < 0) return -ENOENT; } else diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c index 95dbc1454..339caef04 100644 --- a/obexd/plugins/pbap.c +++ b/obexd/plugins/pbap.c @@ -287,8 +287,8 @@ static int pbap_get(struct obex_session *os, obex_object_t *obj, } pbap->params = params; - ret = obex_stream_start(os, path, pbap); + ret = obex_get_stream_start(os, path, pbap); failed: g_free(path); diff --git a/obexd/plugins/syncevolution.c b/obexd/plugins/syncevolution.c index 411cdf280..bf15a6151 100644 --- a/obexd/plugins/syncevolution.c +++ b/obexd/plugins/syncevolution.c @@ -230,7 +230,7 @@ static int synce_put(struct obex_session *os, gpointer user_data) static int synce_get(struct obex_session *os, obex_object_t *obj, gpointer user_data) { - return obex_stream_start(os, NULL, os); + return obex_get_stream_start(os, NULL, os); } static void close_cb(DBusPendingCall *call, void *user_data) diff --git a/obexd/src/obex.c b/obexd/src/obex.c index dee732abb..aafcb4423 100644 --- a/obexd/src/obex.c +++ b/obexd/src/obex.c @@ -453,7 +453,7 @@ static void cmd_setpath(struct obex_session *os, os_set_response(obj, err); } -int obex_stream_start(struct obex_session *os, +int obex_get_stream_start(struct obex_session *os, const gchar *filename, gpointer driver_data) { gint err; @@ -539,13 +539,14 @@ add_header: return len; } -gint obex_prepare_put(struct obex_session *os, const gchar *filename) +int obex_put_stream_start(struct obex_session *os, + const gchar *filename, gpointer driver_data) { gint len; int err; os->object = os->driver->open(filename, O_WRONLY | O_CREAT | O_TRUNC, - 0600, os->driver->driver_data, + 0600, driver_data, os->size != OBJECT_SIZE_UNKNOWN ? (size_t *) &os->size : NULL, &err); if (os->object == NULL) { @@ -554,6 +555,7 @@ gint obex_prepare_put(struct obex_session *os, const gchar *filename) } os->path = filename; + os->driver->driver_data = driver_data; if (!os->buf) { debug("PUT request checked, no buffered data"); diff --git a/obexd/src/obex.h b/obexd/src/obex.h index f1a4f077b..6c9ba4ba9 100644 --- a/obexd/src/obex.h +++ b/obexd/src/obex.h @@ -42,9 +42,10 @@ struct obex_session; void obex_connect_cb(GIOChannel *io, GError *err, gpointer user_data); -int obex_stream_start(struct obex_session *os, +int obex_get_stream_start(struct obex_session *os, + const gchar *filename, gpointer user_data); +int obex_put_stream_start(struct obex_session *os, const gchar *filename, gpointer user_data); -gint obex_prepare_put(struct obex_session *os, const gchar *filename); const char *obex_get_name(struct obex_session *os); ssize_t obex_get_size(struct obex_session *os); const char *obex_get_type(struct obex_session *os); -- 2.47.3