Changeset 4fe3b6d in mainline for uspace/lib/usb/src/debug.c

Timestamp:

2011-05-20T11:07:00Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (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:

merge with development

File:

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

uspace/lib/usb/src/debug.c

@@ -116 +116 @@
         /*
          * Serialize access to log files.
-         * Always print to log file, to screen print only when the enabled
-         * log level is high enough.
+         * Print to screen only messages with higher level than the one
+         * specified during logging initialization.
+         * Print also to file, to it print one more (lower) level as well.
          */
         fibril_mutex_lock(&log_serializer);
@@ -123 +124 @@
         const char *level_name = log_level_name(level);
 
-        if (log_stream != NULL) {
+        if ((log_stream != NULL) && (level <= log_level + 1)) {
                 va_start(args, format);