From 80ecd35469885e6f8ef300819a994dd155550dcb Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 30 Oct 2006 15:22:22 +0000 Subject: Move logging.c from hcid/ to common/ --- common/Makefile.am | 2 +- common/logging.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++ common/logging.h | 35 ++++++++++++++++++++ hcid/Makefile.am | 2 +- hcid/hcid.h | 8 +---- hcid/logging.c | 93 ------------------------------------------------------ 6 files changed, 128 insertions(+), 102 deletions(-) create mode 100644 common/logging.c create mode 100644 common/logging.h delete mode 100644 hcid/logging.c 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/common/logging.c b/common/logging.c new file mode 100644 index 00000000..ddaf0d33 --- /dev/null +++ b/common/logging.c @@ -0,0 +1,90 @@ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2004-2006 Marcel Holtmann + * + * + * 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 +#endif + +#include +#include +#include + +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(); +} 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 + * + * + * 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 #include +#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 - * - * - * 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 -#endif - -#include -#include -#include -#include - -#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(); -} -- cgit