From: "Gustavo F. Padovan" <gustavo@padovan.org>
To: linux-bluetooth@vger.kernel.org
Cc: gustavo@padovan.org
Subject: [PATCH 1/2] log: Add function to get/set debug_string
Date: Wed, 16 Jun 2010 04:31:17 -0300 [thread overview]
Message-ID: <1276673478-9273-1-git-send-email-gustavo@padovan.org> (raw)
---
src/log.c | 53 +++++++++++++++++++++++++++++++++++++++++------------
src/log.h | 2 ++
2 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/src/log.c b/src/log.c
index ed6e428..f53ace3 100644
--- a/src/log.c
+++ b/src/log.c
@@ -71,6 +71,8 @@ extern struct btd_debug_desc __stop___debug[];
static gchar **enabled = NULL;
+static char *debug_string = NULL;
+
static gboolean is_enabled(struct btd_debug_desc *desc)
{
int i;
@@ -90,22 +92,15 @@ static gboolean is_enabled(struct btd_debug_desc *desc)
return 0;
}
-void __btd_toggle_debug()
-{
- struct btd_debug_desc *desc;
-
- for (desc = __start___debug; desc < __stop___debug; desc++)
- desc->flags |= BTD_DEBUG_FLAG_PRINT;
-}
-
-void __btd_log_init(const char *debug, int detach)
+static void debug_on()
{
- int option = LOG_NDELAY | LOG_PID;
struct btd_debug_desc *desc;
const char *name = NULL, *file = NULL;
- if (debug != NULL)
- enabled = g_strsplit_set(debug, ":, ", 0);
+ if (debug_string == NULL)
+ debug_string = g_strdup("");
+
+ enabled = g_strsplit_set(debug_string, ":, ", 0);
for (desc = __start___debug; desc < __stop___debug; desc++) {
if (file != NULL || name != NULL) {
@@ -118,7 +113,41 @@ void __btd_log_init(const char *debug, int detach)
if (is_enabled(desc))
desc->flags |= BTD_DEBUG_FLAG_PRINT;
+ else
+ desc->flags &= ~BTD_DEBUG_FLAG_PRINT;
}
+}
+
+char *__btd_get_debug()
+{
+ return debug_string;
+}
+
+char *__btd_set_debug(char *str)
+{
+ g_free(debug_string);
+ debug_string = g_strdup(str);
+
+ debug_on();
+
+ return debug_string;
+}
+
+void __btd_toggle_debug()
+{
+ struct btd_debug_desc *desc;
+
+ for (desc = __start___debug; desc < __stop___debug; desc++)
+ desc->flags |= BTD_DEBUG_FLAG_PRINT;
+}
+
+void __btd_log_init(const char *debug, int detach)
+{
+ int option = LOG_NDELAY | LOG_PID;
+
+ debug_string = (char *)debug;
+
+ debug_on();
if (!detach)
option |= LOG_PERROR;
diff --git a/src/log.h b/src/log.h
index 4e0e518..2dfce8d 100644
--- a/src/log.h
+++ b/src/log.h
@@ -28,6 +28,8 @@ void btd_debug(const char *format, ...) __attribute__((format(printf, 1, 2)));
void __btd_log_init(const char *debug, int detach);
void __btd_log_cleanup(void);
+char *__btd_get_debug();
+char *__btd_set_debug(char *str);
void __btd_toggle_debug();
struct btd_debug_desc {
--
1.7.1
next reply other threads:[~2010-06-16 7:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-16 7:31 Gustavo F. Padovan [this message]
2010-06-16 7:31 ` [PATCH 2/2] Add SetProperty method and Debug property Gustavo F. Padovan
2010-06-16 10:34 ` Johan Hedberg
2010-06-16 10:29 ` [PATCH 1/2] log: Add function to get/set debug_string Johan Hedberg
2010-06-16 13:31 ` Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1276673478-9273-1-git-send-email-gustavo@padovan.org \
--to=gustavo@padovan.org \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).