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/logging.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 common/logging.c (limited to 'common/logging.c') 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(); +} -- cgit From 607695ed109340f4b7a5628420e0a8e8aee34f4e Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 13 Jan 2007 17:48:12 +0000 Subject: Update copyright information --- common/logging.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/logging.c') diff --git a/common/logging.c b/common/logging.c index ddaf0d33..22cbd7e0 100644 --- a/common/logging.c +++ b/common/logging.c @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2006 Marcel Holtmann + * Copyright (C) 2004-2007 Marcel Holtmann * * * This program is free software; you can redistribute it and/or modify -- cgit From 4d5ea9b073c2cd77d6c833935a9f35f23aba83e7 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 13 Jan 2007 18:29:50 +0000 Subject: Add function for to toggle debug setting --- common/logging.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'common/logging.c') diff --git a/common/logging.c b/common/logging.c index 22cbd7e0..123dd809 100644 --- a/common/logging.c +++ b/common/logging.c @@ -67,12 +67,17 @@ void debug(const char *format, ...) va_end(ap); } -void enable_debug() +void toggle_debug(void) +{ + debug_enabled %= 1; +} + +void enable_debug(void) { debug_enabled = 1; } -void disable_debug() +void disable_debug(void) { debug_enabled = 0; } -- cgit From 857b5c494b814a835973b23932f76d0283a18cc1 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 13 Jan 2007 18:44:29 +0000 Subject: Allow parameters for init message --- common/logging.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'common/logging.c') diff --git a/common/logging.c b/common/logging.c index 123dd809..79d8d362 100644 --- a/common/logging.c +++ b/common/logging.c @@ -31,13 +31,18 @@ static volatile int debug_enabled = 0; +static inline void vinfo(const char *format, va_list ap) +{ + vsyslog(LOG_INFO, format, ap); +} + void info(const char *format, ...) { va_list ap; va_start(ap, format); - vsyslog(LOG_INFO, format, ap); + vinfo(format, ap); va_end(ap); } @@ -82,11 +87,17 @@ void disable_debug(void) debug_enabled = 0; } -void start_logging(const char *ident, const char *message) +void start_logging(const char *ident, const char *message, ...) { + va_list ap; + openlog(ident, LOG_PID | LOG_NDELAY | LOG_PERROR, LOG_DAEMON); - info(message); + va_start(ap, message); + + vinfo(message, ap); + + va_end(ap); } void stop_logging(void) -- cgit From a3418be8059ffc30a0858a738f8955ceae9b39ea Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 13 Jan 2007 20:54:12 +0000 Subject: Fix toggle logic --- common/logging.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/logging.c') diff --git a/common/logging.c b/common/logging.c index 79d8d362..52fd8071 100644 --- a/common/logging.c +++ b/common/logging.c @@ -74,7 +74,7 @@ void debug(const char *format, ...) void toggle_debug(void) { - debug_enabled %= 1; + debug_enabled = (debug_enabled + 1) % 2; } void enable_debug(void) -- cgit From e823c15e43a6f924779e466d434c51157002d9ee Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 2 Feb 2008 03:37:05 +0000 Subject: Update copyright information --- common/logging.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/logging.c') diff --git a/common/logging.c b/common/logging.c index 52fd8071..28fc9af5 100644 --- a/common/logging.c +++ b/common/logging.c @@ -2,7 +2,7 @@ * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2004-2007 Marcel Holtmann + * Copyright (C) 2004-2008 Marcel Holtmann * * * This program is free software; you can redistribute it and/or modify -- cgit