From 488463da5a34ac6b44a28f322009710de032db98 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel.holtmann@intel.com>
Date: Tue, 5 May 2009 18:56:46 -0700
Subject: [PATCH] Update log and plugin functions

---
 include/log.h    |  9 ++++++---
 include/plugin.h |  2 +-
 src/log.c        | 17 ++++++++++++++---
 src/plugin.c     |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/include/log.h b/include/log.h
index cdd3b0f5..47e5ec88 100644
--- a/include/log.h
+++ b/include/log.h
@@ -32,9 +32,12 @@ extern "C" {
  * @short_description: Functions for logging error and debug information
  */
 
-extern void ofono_info(const char *format, ...);
-extern void ofono_error(const char *format, ...);
-extern void ofono_debug(const char *format, ...);
+extern void ofono_info(const char *format, ...)
+				__attribute__((format(printf, 1, 2)));
+extern void ofono_error(const char *format, ...)
+				__attribute__((format(printf, 1, 2)));
+extern void ofono_debug(const char *format, ...)
+				__attribute__((format(printf, 1, 2)));
 
 /**
  * DBG:
diff --git a/include/plugin.h b/include/plugin.h
index 4b01ad43..7c133e39 100644
--- a/include/plugin.h
+++ b/include/plugin.h
@@ -1,6 +1,6 @@
 /*
  *
- *  oFono - Open Telephony stack for Linux
+ *  oFono - Open Source Telephony
  *
  *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
  *
diff --git a/src/log.c b/src/log.c
index d79c99fb..273e3ba0 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,6 +1,6 @@
 /*
  *
- *  oFono - Open Telephony stack for Linux
+ *  oFono - Open Source Telephony
  *
  *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
  *
@@ -90,15 +90,26 @@ void ofono_debug(const char *format, ...)
 	va_end(ap);
 }
 
-int __ofono_log_init(void)
+void __ofono_toggle_debug(void)
+{
+	if (debug_enabled == TRUE)
+		debug_enabled = FALSE;
+	else
+		debug_enabled = TRUE;
+}
+
+int __ofono_log_init(gboolean detach, gboolean debug)
 {
 	int option = LOG_NDELAY | LOG_PID;
 
+	if (detach == FALSE)
+		option |= LOG_PERROR;
+
 	openlog("ofonod", option, LOG_DAEMON);
 
 	syslog(LOG_INFO, "oFono version %s", VERSION);
 
-	debug_enabled = TRUE;
+	debug_enabled = debug;
 
 	return 0;
 }
diff --git a/src/plugin.c b/src/plugin.c
index 9fdb3325..9822359f 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -1,6 +1,6 @@
 /*
  *
- *  oFono - Open Telephony stack for Linux
+ *  oFono - Open Source Telephony
  *
  *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
  *