diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2008-08-04 21:51:10 +0200 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2008-08-04 21:51:10 +0200 |
commit | 2709ae4c8e684f4cbee1c0c99c42fb4afdc8d455 (patch) | |
tree | 3e745aa6b9f460f25ba01f2fab024b38a2340a90 /src | |
parent | 7a6368d26192e81529bc0d39c9c343a822ff175f (diff) |
Move error helpers to bluetoothd source
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 5 | ||||
-rw-r--r-- | src/error.c | 57 | ||||
-rw-r--r-- | src/error.h | 31 |
3 files changed, 90 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 04144dd3..664db750 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,11 +19,10 @@ bluetoothd_SOURCES = main.c hcid.h sdpd.h \ sdpd-server.c sdpd-request.c sdpd-service.c \ sdpd-database.c security.c storage.c \ parser.h parser.y lexer.l kword.c kword.h \ - server.h server.c manager.h manager.c \ + server.h server.c manager.h manager.c error.h error.c \ adapter.h adapter.c device.h device.c plugin.h plugin.c \ - dbus-common.c dbus-common.h \ + dbus-common.c dbus-common.h dbus-hci.h dbus-hci.c \ dbus-database.c dbus-database.h dbus-service.c dbus-service.h \ - dbus-hci.h dbus-hci.c \ telephony.h telephony.c agent.h agent.c bluetoothd_LDADD = $(top_builddir)/common/libhelper.a \ diff --git a/src/error.c b/src/error.c new file mode 100644 index 00000000..825cde4f --- /dev/null +++ b/src/error.c @@ -0,0 +1,57 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2006-2007 Nokia Corporation + * Copyright (C) 2004-2008 Marcel Holtmann <marcel@holtmann.org> + * Copyright (C) 2007-2008 Fabien Chevalier <fabchevalier@free.fr> + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include <gdbus.h> + +#include "error.h" + +/* Helper function - internal use only */ +DBusHandlerResult error_common_reply(DBusConnection *conn, DBusMessage *msg, + const char *name, const char *descr) +{ + DBusMessage *derr; + dbus_bool_t ret; + + if (!conn || !msg) + return DBUS_HANDLER_RESULT_HANDLED; + + derr = dbus_message_new_error(msg, name, descr); + if (!derr) + return DBUS_HANDLER_RESULT_NEED_MEMORY; + + ret = dbus_connection_send(conn, derr, NULL); + + dbus_message_unref(derr); + + return DBUS_HANDLER_RESULT_HANDLED; +} diff --git a/src/error.h b/src/error.h new file mode 100644 index 00000000..644e385f --- /dev/null +++ b/src/error.h @@ -0,0 +1,31 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2006-2007 Nokia Corporation + * Copyright (C) 2004-2008 Marcel Holtmann <marcel@holtmann.org> + * Copyright (C) 2007-2008 Fabien Chevalier <fabchevalier@free.fr> + * + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include <dbus/dbus.h> + +#define ERROR_INTERFACE "org.bluez.Error" + +DBusHandlerResult error_common_reply(DBusConnection *conn, DBusMessage *msg, + const char *name, const char *descr); |