Move logging.c from hcid/ to common/

5 files changed, 38 insertions, 12 deletions

diff --git a/common/Makefile.am b/common/Makefile.am
index 30211fab..b2f6fb33 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -3,7 +3,7 @@ noinst_LIBRARIES = libhelper.a
 
 libhelper_a_SOURCES = oui.h oui.c list.h list.c \
 	textfile.h textfile.c helper.h helper.c \
-	glib-ectomy.h glib-ectomy.c
+	glib-ectomy.h glib-ectomy.c logging.h logging.c
 
 noinst_PROGRAMS = test_textfile
 
diff --git a/hcid/logging.c b/common/logging.c
index f25dc10a..ddaf0d33 100644
--- a/hcid/logging.c
+++ b/common/logging.c
@@ -26,12 +26,9 @@
 #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, ...)
diff --git a/common/logging.h b/common/logging.h
new file mode 100644
index 00000000..1e2ca525
--- /dev/null
+++ b/common/logging.h
@@ -0,0 +1,35 @@
+/*
+ *
+ *  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
+ *
+ */
+
+#ifndef __LOGGING_H
+#define __LOGGING_H
+
+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);
+
+#endif /* __LOGGING_H */
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);