Once the modules are using the new callback style, the session API can
be simplified and the old functions to access session->p removed.
---
client/session.c | 40 ----------------------------------------
client/session.h | 3 ---
2 files changed, 0 insertions(+), 43 deletions(-)
diff --git a/client/session.c b/client/session.c
index 408428c..b994080 100644
--- a/client/session.c
+++ b/client/session.c
@@ -1132,46 +1132,6 @@ const char *obc_session_get_target(struct obc_session *session)
return session->driver->target;
}
-static struct obc_transfer *obc_session_get_transfer(
- struct obc_session *session)
-{
- if (session->p == NULL)
- return NULL;
-
- return session->p->transfer;
-}
-
-int obc_session_get_contents(struct obc_session *session, char **contents,
- size_t *size)
-{
- struct obc_transfer *transfer;
-
- transfer = obc_session_get_transfer(session);
- if (transfer == NULL) {
- if (size != NULL)
- *size = 0;
-
- return -EINVAL;
- }
-
- return obc_transfer_get_contents(transfer, contents, size);
-}
-
-const void *obc_session_get_params(struct obc_session *session, size_t *size)
-{
- struct obc_transfer *transfer;
-
- transfer = obc_session_get_transfer(session);
- if (transfer == NULL) {
- if (size != NULL)
- *size = 0;
-
- return NULL;
- }
-
- return obc_transfer_get_params(transfer, size);
-}
-
static void setpath_complete(struct obc_session *session,
struct obc_transfer *transfer,
GError *err, void *user_data)
diff --git a/client/session.h b/client/session.h
index ca97900..06aaa1b 100644
--- a/client/session.h
+++ b/client/session.h
@@ -53,9 +53,6 @@ const char *obc_session_get_agent(struct obc_session *session);
const char *obc_session_get_path(struct obc_session *session);
const char *obc_session_get_target(struct obc_session *session);
-int obc_session_get_contents(struct obc_session *session, char **contents,
- size_t *size);
-const void *obc_session_get_params(struct obc_session *session, size_t *size);
guint obc_session_send(struct obc_session *session, const char *filename,
const char *name, GError **err);
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
