From d1f188d4b3822b9ac2bc333f1cb47b54536f6843 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 16 Feb 2009 19:48:54 +0200 Subject: Convert BtIO API to use GError --- common/btio.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'common/btio.h') diff --git a/common/btio.h b/common/btio.h index 834e8527..614a1632 100644 --- a/common/btio.h +++ b/common/btio.h @@ -26,6 +26,17 @@ #include +typedef enum { + BT_IO_ERROR_DISCONNECTED, + BT_IO_ERROR_CONNECT_FAILED, + BT_IO_ERROR_FAILED, + BT_IO_ERROR_INVALID_ARGS, +} BtIOError; + +#define BT_IO_ERROR bt_io_error_quark() + +GQuark bt_io_error_quark(void); + typedef enum { BT_IO_L2RAW, BT_IO_L2CAP, @@ -50,21 +61,24 @@ typedef enum { typedef void (*BtIOConfirm)(GIOChannel *io, gpointer user_data); -typedef void (*BtIOConnect)(GIOChannel *io, int err, gpointer user_data); +typedef void (*BtIOConnect)(GIOChannel *io, GError *err, gpointer user_data); gboolean bt_io_accept(GIOChannel *io, BtIOConnect connect, gpointer user_data, - GDestroyNotify destroy); + GDestroyNotify destroy, GError **err); -gboolean bt_io_set(GIOChannel *io, BtIOType type, BtIOOption opt1, ...); +gboolean bt_io_set(GIOChannel *io, BtIOType type, GError **err, + BtIOOption opt1, ...); -gboolean bt_io_get(GIOChannel *io, BtIOType type, BtIOOption opt1, ...); +gboolean bt_io_get(GIOChannel *io, BtIOType type, GError **err, + BtIOOption opt1, ...); GIOChannel *bt_io_connect(BtIOType type, BtIOConnect connect, gpointer user_data, GDestroyNotify destroy, - BtIOOption opt1, ...); + GError **err, BtIOOption opt1, ...); GIOChannel *bt_io_listen(BtIOType type, BtIOConnect connect, BtIOConfirm confirm, gpointer user_data, - GDestroyNotify destroy, BtIOOption opt1, ...); + GDestroyNotify destroy, GError **err, + BtIOOption opt1, ...); #endif -- cgit