Changeset 0c37135 in mainline for kernel/generic/src/printf/printf_core.c

Timestamp:

2012-04-18T07:32:58Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

5f67cd61

Parents:

3d93289a (diff), 63920b0 (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 mainline

File:

• kernel/generic/src/printf/printf_core.c (modified) (2 diffs)

kernel/generic/src/printf/printf_core.c

@@ -284 +284 @@
         /* Print leading spaces. */
         size_t strw = str_length(str);
-        if (precision == 0)
+        if ((precision == 0) || (precision > strw))
                 precision = strw;
         
@@ -332 +332 @@
         /* Print leading spaces. */
         size_t strw = wstr_length(str);
-        if (precision == 0)
+        if ((precision == 0) || (precision > strw))
                 precision = strw;