Changeset 89acf204 in mainline for uspace/lib/usb/src/debug.c

Timestamp:

2011-02-04T17:07:33Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

400575c5, 474afc9

Parents:

2899980 (diff), 458e40c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

development changes

File:

• uspace/lib/usb/src/debug.c (modified) (2 diffs)

uspace/lib/usb/src/debug.c

@@ -206 +206 @@
 void usb_log_printf(usb_log_level_t level, const char *format, ...)
 {
-        FILE *stream = NULL;
+        FILE *screen_stream = NULL;
         switch (level) {
                 case USB_LOG_LEVEL_FATAL:
                 case USB_LOG_LEVEL_ERROR:
-                        stream = stderr;
+                        screen_stream = stderr;
                         break;
                 default:
-                        stream = stdout;
+                        screen_stream = stdout;
                         break;
         }
-        assert(stream != NULL);
+        assert(screen_stream != NULL);
 
         va_list args;
-        va_start(args, format);
 
         /*
@@ -231 +230 @@
 
         if (log_stream != NULL) {
+                va_start(args, format);
+
                 fprintf(log_stream, "[%s]%s: ", log_prefix, level_name);
                 vfprintf(log_stream, format, args);
+                fflush(log_stream);
+
+                va_end(args);
         }
 
         if (level <= log_level) {
-                fprintf(stream, "[%s]%s: ", log_prefix, level_name);
-                vfprintf(stream, format, args);
+                va_start(args, format);
+
+                fprintf(screen_stream, "[%s]%s: ", log_prefix, level_name);
+                vfprintf(screen_stream, format, args);
+                fflush(screen_stream);
+
+                va_end(args);
         }
 
         fibril_mutex_unlock(&log_serializer);
-
-        va_end(args);
 }