Move error helpers to bluetoothd source

3 files changed, 2 insertions, 91 deletions

diff --git a/common/Makefile.am b/common/Makefile.am
index 3a5add7c..79b533c5 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,9 +1,8 @@
 
 noinst_LIBRARIES = libhelper.a
 
-libhelper_a_SOURCES = oui.h oui.c textfile.h textfile.c \
-	logging.h logging.c error.h error.c \
-	glib-helper.h glib-helper.c sdp-xml.h sdp-xml.c sdp-glib.c
+libhelper_a_SOURCES = oui.h oui.c textfile.h textfile.c logging.h logging.c \
+		glib-helper.h glib-helper.c sdp-xml.h sdp-xml.c sdp-glib.c
 
 noinst_PROGRAMS = test_textfile
 
diff --git a/common/error.c b/common/error.c
deleted file mode 100644
index 825cde4f..00000000
--- a/common/error.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *
- *  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/common/error.h b/common/error.h
deleted file mode 100644
index 644e385f..00000000
--- a/common/error.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *
- *  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);