Changeset 810a36f in mainline for kernel/generic/src/printf/printf_core.c

Timestamp:

2017-10-24T05:29:08Z (6 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

b1eb7ef

Parents:

c8fbbe7 (diff), 673ea28 (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 branch 'types'.

File:

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

kernel/generic/src/printf/printf_core.c

@@ -104 +104 @@
         PrintfQualifierLongLong,
         PrintfQualifierPointer,
-        PrintfQualifierSize
+        PrintfQualifierSize,
+        PrintfQualifierMax
 } qualifier_t;
 
@@ -767 +768 @@
                         case 'z':
                                 qualifier = PrintfQualifierSize;
+                                i = nxt;
+                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                                break;
+                        case 'j':
+                                qualifier = PrintfQualifierMax;
                                 i = nxt;
                                 uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
@@ -892 +898 @@
                                 number = (uint64_t) va_arg(ap, size_t);
                                 break;
+                        case PrintfQualifierMax:
+                                size = sizeof(uintmax_t);
+                                number = (uint64_t) va_arg(ap, uintmax_t);
+                                break;
                         default:
                                 /* Unknown qualifier */