[tuxdroid-svn] r432 - daemon/trunk/libs

[neimad <c2m...@c2...>]

Author: neimad
Date: 2007-06-24 14:31:59 +0200 (Sun, 24 Jun 2007)
New Revision: 432

Modified:
   daemon/trunk/libs/USBDaemon_log.c
   daemon/trunk/libs/USBDaemon_log.h
Log:
* Use bool in logging facility.


Modified: daemon/trunk/libs/USBDaemon_log.c
===================================================================
--- daemon/trunk/libs/USBDaemon_log.c	2007-06-24 12:25:51 UTC (rev 431)
+++ daemon/trunk/libs/USBDaemon_log.c	2007-06-24 12:31:59 UTC (rev 432)
@@ -45,19 +45,19 @@
 static FILE *log_file;
 
 /** Whether the log has been opened */
-static int log_opened;
+static bool log_opened;
 
 /**
  * @brief Open the log.
  *
  * @param[in] target  Logging target
  *
- * @return 1 if successfull, 0 otherwise
+ * @return true if successfull, false otherwise
  */
-int log_open(log_target_t target)
+bool log_open(log_target_t target)
 {
     if (log_opened)
-        return 1;
+        return true;
 
     switch (target)
     {
@@ -68,7 +68,7 @@
     case LOG_TARGET_TUX:
         log_file = fopen(LOG_FILE, "at");
         if (log_file == NULL)
-            return 0;
+            return false;
         break;
 
     case LOG_TARGET_SHELL:
@@ -76,9 +76,9 @@
     }
 
     log_target = target;
-    log_opened = 1;
+    log_opened = true;
 
-    return 1;
+    return true;
 }
 
 /**
@@ -104,7 +104,7 @@
         break;
     }
 
-    log_opened = 0;
+    log_opened = false;
 }
 
 /**
@@ -138,9 +138,9 @@
  * If the priority of the specifed level is lower than the priority
  * of the current logging level, the message is silently dropped.
  *
- * @return 1 if successful, 0 otherwise
+ * @return true if successful, false otherwise
  */
-int log_text(log_level_t at_level, const char *fmt, ...)
+bool log_text(log_level_t at_level, const char *fmt, ...)
 {
     char text[1024], *p = text;
     size_t size = sizeof(text);
@@ -151,13 +151,13 @@
 
     /* No need for the log to be 'opened' when logging to std{out,err} */
     if (log_target != LOG_TARGET_SHELL && !log_opened)
-        return 0;
+        return false;
 
     /* Logging at level NONE has no sense */
     assert(at_level >= LOG_LEVEL_DEBUG && at_level < LOG_LEVEL_NONE);
 
     if (at_level < current_level)
-        return 1;
+        return true;
 
     /* Add date & time when LOG_TARGET_TUX */
     if (log_target == LOG_TARGET_TUX)
@@ -165,7 +165,7 @@
         now = time(NULL);
         r = strftime(p, size, "%F %T ", localtime(&now));
         if (r == 0)
-            return 0;
+            return false;
 
         p += r;
         size -= r;
@@ -176,7 +176,7 @@
     {
         r = snprintf(p, size, "%s: ", level_names[at_level]);
         if (r < 0)
-            return 0;
+            return false;
 
         p += r;
         size -= r;
@@ -186,7 +186,7 @@
     r = vsnprintf(p, size, fmt, al);
     va_end(al);
     if (r < 0)
-        return 0;
+        return false;
 
     switch (log_target)
     {
@@ -207,5 +207,5 @@
         break;
     }
 
-    return 1;
+    return true;
 }

Modified: daemon/trunk/libs/USBDaemon_log.h
===================================================================
--- daemon/trunk/libs/USBDaemon_log.h	2007-06-24 12:25:51 UTC (rev 431)
+++ daemon/trunk/libs/USBDaemon_log.h	2007-06-24 12:31:59 UTC (rev 432)
@@ -1,6 +1,8 @@
 #ifndef __USBDAEMON_LOG_H__
 #define __USBDAEMON_LOG_H__
 
+#include <stdbool.h>
+
 /** Logging target */
 typedef enum log_target
 {
@@ -9,7 +11,7 @@
     LOG_TARGET_SHELL
 } log_target_t;
 
-extern int log_open(log_target_t target);
+extern bool log_open(log_target_t target);
 extern void log_close(void);
 
 /** Logging levels, in increasing priorities */
@@ -25,7 +27,7 @@
 extern void log_set_level(log_level_t new_level);
 extern log_level_t log_get_level(void);
 
-extern int log_text(log_level_t at_level, const char *fmt, ...)
+extern bool log_text(log_level_t at_level, const char *fmt, ...)
     __attribute__((format(printf, 2, 3)));
 
 #define log_debug(fmt, ...)  log_text(LOG_LEVEL_DEBUG, (fmt), ## __VA_ARGS__)