Changeset 5415

Timestamp:

03/15/08 16:24:09 (4 months ago)

Author:

morris

Message:

Guard against log callback recursion

Files:

• libwired/trunk/libwired/system/wi-log.c (modified) (3 diffs)

libwired/trunk/libwired/system/wi-log.c

@@ -79 +79 @@
-
-static int                                              _wi_log_lines;
-
+
-static wi_lock_t                                *_wi_log_lock;
-
@@ -154 +154 @@
-        char                    date[_WI_LOG_DATE_SIZE];
-        int                             priority;
+        
+        if(_wi_log_in_callback)
+                return;
-        
-        string = wi_string_init_with_format_and_arguments(wi_string_alloc(), fmt, ap);
@@ -224 +227 @@
-        }
-
-
+
+
-                (*wi_log_callback)(level, string);
+                _wi_log_in_callback = false;
+        }
-
-        if(wi_log_startup && level == WI_LOG_ERR)