* [PATCH V2 0/2] cleanup btio library
@ 2010-09-13 8:04 Zhenhua Zhang
2010-09-13 8:04 ` [PATCH V2 1/2] btio: Replace void * with gpointer Zhenhua Zhang
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Zhenhua Zhang @ 2010-09-13 8:04 UTC (permalink / raw)
To: linux-bluetooth
Hi,
These two patches are to cleanup btio.[ch] in obex source directory.
Regards,
Zhenhua
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH V2 1/2] btio: Replace void * with gpointer 2010-09-13 8:04 [PATCH V2 0/2] cleanup btio library Zhenhua Zhang @ 2010-09-13 8:04 ` Zhenhua Zhang 2010-09-13 8:04 ` [PATCH V2 2/2] btio: Seperate btio.[ch] into btio directory Zhenhua Zhang 2010-09-13 8:16 ` [PATCH V2 0/2] cleanup btio library Johan Hedberg 2 siblings, 0 replies; 5+ messages in thread From: Zhenhua Zhang @ 2010-09-13 8:04 UTC (permalink / raw) To: linux-bluetooth To make it consistent with bluez btio.c. --- src/btio.c | 24 ++++++++++++------------ src/btio.h | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/btio.c b/src/btio.c index 42a3bcd..8b273ca 100644 --- a/src/btio.c +++ b/src/btio.c @@ -62,20 +62,20 @@ struct set_opts { struct connect { BtIOConnect connect; - void *user_data; + gpointer user_data; GDestroyNotify destroy; }; struct accept { BtIOConnect connect; - void *user_data; + gpointer user_data; GDestroyNotify destroy; }; struct server { BtIOConnect connect; BtIOConfirm confirm; - void *user_data; + gpointer user_data; GDestroyNotify destroy; }; @@ -115,7 +115,7 @@ static gboolean check_nval(GIOChannel *io) } static gboolean accept_cb(GIOChannel *io, GIOCondition cond, - void *user_data) + gpointer user_data) { struct accept *accept = user_data; GError *err = NULL; @@ -136,7 +136,7 @@ static gboolean accept_cb(GIOChannel *io, GIOCondition cond, } static gboolean connect_cb(GIOChannel *io, GIOCondition cond, - void *user_data) + gpointer user_data) { struct connect *conn = user_data; GError *gerr = NULL; @@ -169,7 +169,7 @@ static gboolean connect_cb(GIOChannel *io, GIOCondition cond, } static gboolean server_cb(GIOChannel *io, GIOCondition cond, - void *user_data) + gpointer user_data) { struct server *server = user_data; int srv_sock, cli_sock; @@ -201,7 +201,7 @@ static gboolean server_cb(GIOChannel *io, GIOCondition cond, } static void server_add(GIOChannel *io, BtIOConnect connect, - BtIOConfirm confirm, void *user_data, + BtIOConfirm confirm, gpointer user_data, GDestroyNotify destroy) { struct server *server; @@ -219,7 +219,7 @@ static void server_add(GIOChannel *io, BtIOConnect connect, } static void connect_add(GIOChannel *io, BtIOConnect connect, - void *user_data, GDestroyNotify destroy) + gpointer user_data, GDestroyNotify destroy) { struct connect *conn; GIOCondition cond; @@ -234,7 +234,7 @@ static void connect_add(GIOChannel *io, BtIOConnect connect, (GDestroyNotify) connect_remove); } -static void accept_add(GIOChannel *io, BtIOConnect connect, void *user_data, +static void accept_add(GIOChannel *io, BtIOConnect connect, gpointer user_data, GDestroyNotify destroy) { struct accept *accept; @@ -1046,7 +1046,7 @@ static gboolean get_valist(GIOChannel *io, BtIOType type, GError **err, return FALSE; } -gboolean bt_io_accept(GIOChannel *io, BtIOConnect connect, void *user_data, +gboolean bt_io_accept(GIOChannel *io, BtIOConnect connect, gpointer user_data, GDestroyNotify destroy, GError **err) { int sock; @@ -1195,7 +1195,7 @@ failed: } GIOChannel *bt_io_connect(BtIOType type, BtIOConnect connect, - void *user_data, GDestroyNotify destroy, + gpointer user_data, GDestroyNotify destroy, GError **gerr, BtIOOption opt1, ...) { GIOChannel *io; @@ -1249,7 +1249,7 @@ GIOChannel *bt_io_connect(BtIOType type, BtIOConnect connect, } GIOChannel *bt_io_listen(BtIOType type, BtIOConnect connect, - BtIOConfirm confirm, void *user_data, + BtIOConfirm confirm, gpointer user_data, GDestroyNotify destroy, GError **err, BtIOOption opt1, ...) { diff --git a/src/btio.h b/src/btio.h index e9dcc9f..d373ed1 100644 --- a/src/btio.h +++ b/src/btio.h @@ -72,11 +72,11 @@ typedef enum { BT_IO_SEC_HIGH, } BtIOSecLevel; -typedef void (*BtIOConfirm)(GIOChannel *io, void *user_data); +typedef void (*BtIOConfirm)(GIOChannel *io, gpointer user_data); -typedef void (*BtIOConnect)(GIOChannel *io, GError *err, void *user_data); +typedef void (*BtIOConnect)(GIOChannel *io, GError *err, gpointer user_data); -gboolean bt_io_accept(GIOChannel *io, BtIOConnect connect, void *user_data, +gboolean bt_io_accept(GIOChannel *io, BtIOConnect connect, gpointer user_data, GDestroyNotify destroy, GError **err); gboolean bt_io_set(GIOChannel *io, BtIOType type, GError **err, @@ -86,11 +86,11 @@ gboolean bt_io_get(GIOChannel *io, BtIOType type, GError **err, BtIOOption opt1, ...); GIOChannel *bt_io_connect(BtIOType type, BtIOConnect connect, - void *user_data, GDestroyNotify destroy, + gpointer user_data, GDestroyNotify destroy, GError **err, BtIOOption opt1, ...); GIOChannel *bt_io_listen(BtIOType type, BtIOConnect connect, - BtIOConfirm confirm, void *user_data, + BtIOConfirm confirm, gpointer user_data, GDestroyNotify destroy, GError **err, BtIOOption opt1, ...); -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH V2 2/2] btio: Seperate btio.[ch] into btio directory 2010-09-13 8:04 [PATCH V2 0/2] cleanup btio library Zhenhua Zhang 2010-09-13 8:04 ` [PATCH V2 1/2] btio: Replace void * with gpointer Zhenhua Zhang @ 2010-09-13 8:04 ` Zhenhua Zhang 2010-09-13 8:16 ` [PATCH V2 0/2] cleanup btio library Johan Hedberg 2 siblings, 0 replies; 5+ messages in thread From: Zhenhua Zhang @ 2010-09-13 8:04 UTC (permalink / raw) To: linux-bluetooth Seperate btio.[ch] from src directory to btio sub-folder. --- Makefile.am | 19 ++++++++++--------- {src => btio}/btio.c | 0 {src => btio}/btio.h | 0 3 files changed, 10 insertions(+), 9 deletions(-) rename {src => btio}/btio.c (100%) rename {src => btio}/btio.h (100%) diff --git a/Makefile.am b/Makefile.am index e6940bc..175747c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,8 @@ gwobex_sources = gwobex/gw-obex.h gwobex/gw-obex.c \ gwobex/obex-xfer.h gwobex/obex-xfer.c \ gwobex/utils.h gwobex/utils.c gwobex/log.h +btio_sources = btio/btio.h btio/btio.c + libexec_PROGRAMS = if SERVER @@ -66,11 +68,10 @@ builtin_nodist += plugins/phonebook.c libexec_PROGRAMS += src/obexd -src_obexd_SOURCES = $(gdbus_sources) $(builtin_sources) \ +src_obexd_SOURCES = $(gdbus_sources) $(builtin_sources) $(btio_sources) \ src/main.c src/obexd.h src/plugin.h src/plugin.c \ - src/log.h src/log.c src/btio.h src/btio.c \ - src/dbus.h src/manager.c src/obex.h src/obex.c \ - src/obex-priv.h \ + src/log.h src/log.c src/dbus.h src/manager.c \ + src/obex.h src/obex.c src/obex-priv.h \ src/mimetype.h src/mimetype.c \ src/service.h src/service.c \ src/transport.h src/transport.c \ @@ -108,13 +109,12 @@ service_in_files += client/obex-client.service.in libexec_PROGRAMS += client/obex-client -client_obex_client_SOURCES = $(gdbus_sources) $(gwobex_sources) client/main.c \ - client/session.h client/session.c \ +client_obex_client_SOURCES = $(gdbus_sources) $(gwobex_sources) $(btio_sources) \ + client/main.c client/session.h client/session.c \ src/log.h src/log.c \ client/pbap.h client/pbap.c \ client/sync.h client/sync.c \ - client/transfer.h client/transfer.c \ - src/btio.c src/btio.h + client/transfer.h client/transfer.c client_obex_client_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @OPENOBEX_LIBS@ @BLUEZ_LIBS@ endif @@ -127,7 +127,8 @@ AM_CFLAGS = @OPENOBEX_CFLAGS@ @BLUEZ_CFLAGS@ @EBOOK_CFLAGS@ \ -DOBEX_PLUGIN_BUILTIN -DPLUGINDIR=\""$(plugindir)"\" INCLUDES = -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/plugins \ - -I$(srcdir)/gdbus -I$(srcdir)/gwobex + -I$(srcdir)/gdbus -I$(srcdir)/gwobex \ + -I$(srcdir)/btio CLEANFILES = $(service_DATA) $(builtin_files) diff --git a/src/btio.c b/btio/btio.c similarity index 100% rename from src/btio.c rename to btio/btio.c diff --git a/src/btio.h b/btio/btio.h similarity index 100% rename from src/btio.h rename to btio/btio.h -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH V2 0/2] cleanup btio library 2010-09-13 8:04 [PATCH V2 0/2] cleanup btio library Zhenhua Zhang 2010-09-13 8:04 ` [PATCH V2 1/2] btio: Replace void * with gpointer Zhenhua Zhang 2010-09-13 8:04 ` [PATCH V2 2/2] btio: Seperate btio.[ch] into btio directory Zhenhua Zhang @ 2010-09-13 8:16 ` Johan Hedberg 2 siblings, 0 replies; 5+ messages in thread From: Johan Hedberg @ 2010-09-13 8:16 UTC (permalink / raw) To: Zhenhua Zhang; +Cc: linux-bluetooth Hi Zhenhua, On Mon, Sep 13, 2010, Zhenhua Zhang wrote: > These two patches are to cleanup btio.[ch] in obex source directory. Thanks. Both patches have been pushed to obexd upstream. Johan ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V2 0/2] bluez: cleanup btio library @ 2010-09-13 8:17 Zhenhua Zhang 2010-09-13 8:17 ` [PATCH V2 2/2] btio: Seperate btio.[ch] into btio directory Zhenhua Zhang 0 siblings, 1 reply; 5+ messages in thread From: Zhenhua Zhang @ 2010-09-13 8:17 UTC (permalink / raw) To: linux-bluetooth Hi, These two patches are to cleanup BlueZ btio.[ch] in bluez source directory. Regards, Zhenhua ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V2 2/2] btio: Seperate btio.[ch] into btio directory 2010-09-13 8:17 [PATCH V2 0/2] bluez: " Zhenhua Zhang @ 2010-09-13 8:17 ` Zhenhua Zhang 0 siblings, 0 replies; 5+ messages in thread From: Zhenhua Zhang @ 2010-09-13 8:17 UTC (permalink / raw) To: linux-bluetooth Seperate btio.[ch] from src directory to btio sub-folder. --- Makefile.am | 8 +++++--- Makefile.tools | 2 +- {src => btio}/btio.c | 0 {src => btio}/btio.h | 0 4 files changed, 6 insertions(+), 4 deletions(-) rename {src => btio}/btio.c (100%) rename {src => btio}/btio.h (100%) diff --git a/Makefile.am b/Makefile.am index 7895be2..a8829d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,6 +102,8 @@ endif gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \ gdbus/object.c gdbus/polkit.c +btio_sources = btio/btio.h btio/btio.c + builtin_modules = builtin_sources = builtin_nodist = @@ -216,14 +218,14 @@ endif sbin_PROGRAMS += src/bluetoothd src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \ - $(attrib_sources) \ + $(attrib_sources) $(btio_sources) \ $(mcap_sources) \ src/main.c src/log.h src/log.c \ src/security.c src/rfkill.c src/hcid.h src/sdpd.h \ src/sdpd-server.c src/sdpd-request.c \ src/sdpd-service.c src/sdpd-database.c \ src/attrib-server.h src/attrib-server.c \ - src/sdp-xml.h src/sdp-xml.c src/btio.h src/btio.c \ + src/sdp-xml.h src/sdp-xml.c \ src/textfile.h src/textfile.c \ src/glib-helper.h src/glib-helper.c \ src/oui.h src/oui.c src/uinput.h src/ppoll.h \ @@ -357,7 +359,7 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ \ INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \ -I$(srcdir)/audio -I$(srcdir)/sbc -I$(srcdir)/gdbus \ - -I$(srcdir)/attrib + -I$(srcdir)/attrib -I$(srcdir)/btio if MCAP INCLUDES += -I$(builddir)/health diff --git a/Makefile.tools b/Makefile.tools index 1c46542..14ecf31 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -170,7 +170,7 @@ test_bdaddr_LDADD = lib/libbluetooth.la test_agent_LDADD = @DBUS_LIBS@ -test_btiotest_SOURCES = test/btiotest.c src/btio.h src/btio.c +test_btiotest_SOURCES = test/btiotest.c btio/btio.h btio/btio.c test_btiotest_LDADD = @GLIB_LIBS@ lib/libbluetooth.la test_test_textfile_SOURCES = test/test-textfile.c src/textfile.h src/textfile.c diff --git a/src/btio.c b/btio/btio.c similarity index 100% rename from src/btio.c rename to btio/btio.c diff --git a/src/btio.h b/btio/btio.h similarity index 100% rename from src/btio.h rename to btio/btio.h -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-09-13 8:17 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-09-13 8:04 [PATCH V2 0/2] cleanup btio library Zhenhua Zhang 2010-09-13 8:04 ` [PATCH V2 1/2] btio: Replace void * with gpointer Zhenhua Zhang 2010-09-13 8:04 ` [PATCH V2 2/2] btio: Seperate btio.[ch] into btio directory Zhenhua Zhang 2010-09-13 8:16 ` [PATCH V2 0/2] cleanup btio library Johan Hedberg -- strict thread matches above, loose matches on Subject: below -- 2010-09-13 8:17 [PATCH V2 0/2] bluez: " Zhenhua Zhang 2010-09-13 8:17 ` [PATCH V2 2/2] btio: Seperate btio.[ch] into btio directory Zhenhua Zhang
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).