From 31969b0483197833e8e3665b1dad67674172eaaf Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 21 Nov 2008 12:21:27 +0200 Subject: [PATCH] obexd: Change obex_t variable name to avoid confusion --- obexd/src/obex.c | 2 +- obexd/src/obex.h | 2 +- obexd/src/phonebook.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/obexd/src/obex.c b/obexd/src/obex.c index a0e5e7566..49d19b9b8 100644 --- a/obexd/src/obex.c +++ b/obexd/src/obex.c @@ -990,7 +990,7 @@ gint obex_session_start(gint fd, struct server *server) } OBEX_SetUserData(obex, os); - os->handle = obex; + os->obex = obex; OBEX_SetTransportMTU(obex, os->rx_mtu, os->tx_mtu); diff --git a/obexd/src/obex.h b/obexd/src/obex.h index 188e0a88b..9856e3cf0 100644 --- a/obexd/src/obex.h +++ b/obexd/src/obex.h @@ -81,7 +81,7 @@ struct obex_session { struct obex_commands *cmds; struct server *server; gboolean checked; - obex_t *handle; + obex_t *obex; struct phonebook_context *pbctx; gboolean finished; }; diff --git a/obexd/src/phonebook.c b/obexd/src/phonebook.c index 4b760b288..1b7d72383 100644 --- a/obexd/src/phonebook.c +++ b/obexd/src/phonebook.c @@ -123,7 +123,7 @@ void phonebook_return(struct phonebook_context *context, if (buf == NULL || size == 0) { session->finished = 1; - OBEX_ResumeRequest(session->handle); + OBEX_ResumeRequest(session->obex); return; } @@ -131,7 +131,7 @@ void phonebook_return(struct phonebook_context *context, memcpy(session->buf + session->size, buf, size); session->size += size; - OBEX_ResumeRequest(session->handle); + OBEX_ResumeRequest(session->obex); } struct phonebook_driver *phonebook_get_driver(const char *name) -- 2.47.3