Move logging.c from hcid/ to common/

3 files changed, 2 insertions, 101 deletions

diff --git a/hcid/Makefile.am b/hcid/Makefile.am
index 28f90347..c1ac1c4d 100644
--- a/hcid/Makefile.am
+++ b/hcid/Makefile.am
@@ -17,7 +17,7 @@ sbin_PROGRAMS = hcid
 
 noinst_PROGRAMS = passkey-agent service-agent auth-agent
 
-hcid_SOURCES = main.c security.c device.c logging.c storage.c \
+hcid_SOURCES = main.c security.c device.c storage.c \
 		sdp.c sdp.h hcid.h parser.h parser.y \
 		lexer.l kword.c kword.h \
 		dbus.h dbus.c dbus-common.c \
diff --git a/hcid/hcid.h b/hcid/hcid.h
index c109f7a2..3950abcd 100644
--- a/hcid/hcid.h
+++ b/hcid/hcid.h
@@ -29,6 +29,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 
+#include "logging.h"
 #include "glib-ectomy.h"
 
 #define HCID_CONFIG_FILE CONFIGDIR "/hcid.conf"
@@ -211,10 +212,3 @@ int read_link_key(bdaddr_t *local, bdaddr_t *peer, unsigned char *key);
 int read_pin_length(bdaddr_t *local, bdaddr_t *peer);
 int read_pin_code(bdaddr_t *local, bdaddr_t *peer, char *pin);
 
-void info(const char *format, ...);
-void error(const char *format, ...);
-void debug(const char *format, ...);
-void enable_debug();
-void disable_debug();
-void start_logging(const char *ident, const char *message);
-void stop_logging(void);
diff --git a/hcid/logging.c b/hcid/logging.c
deleted file mode 100644
index f25dc10a..00000000
--- a/hcid/logging.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2004-2006  Marcel Holtmann <marcel@holtmann.org>
- *
- *
- *  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 <errno.h>
-#include <stdarg.h>
-#include <syslog.h>
-
-#include "hcid.h"
-
-static volatile int debug_enabled = 0;
-
-void info(const char *format, ...)
-{
-	va_list ap;
-
-	va_start(ap, format);
-
-	vsyslog(LOG_INFO, format, ap);
-
-	va_end(ap);
-}
-
-void error(const char *format, ...)
-{
-	va_list ap;
-
-	va_start(ap, format);
-
-	vsyslog(LOG_ERR, format, ap);
-
-	va_end(ap);
-}
-
-void debug(const char *format, ...)
-{
-	va_list ap;
-
-	if (!debug_enabled)
-		return;
-
-	va_start(ap, format);
-
-	vsyslog(LOG_DEBUG, format, ap);
-
-	va_end(ap);
-}
-
-void enable_debug()
-{
-	debug_enabled = 1;
-}
-
-void disable_debug()
-{
-	debug_enabled = 0;
-}
-
-void start_logging(const char *ident, const char *message)
-{
-	openlog(ident, LOG_PID | LOG_NDELAY | LOG_PERROR, LOG_DAEMON);
-
-	info(message);
-}
-
-void stop_logging(void)
-{
-	closelog();
-}