Changeset 25a76ab8 in mainline for uspace/lib/c/generic/io/printf_core.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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 mainline changes.

File:

• uspace/lib/c/generic/io/printf_core.c (modified) (7 diffs)

uspace/lib/c/generic/io/printf_core.c

@@ -260 +260 @@
         if (str == NULL)
                 return printf_putstr(nullstr, ps);
-
+        
         /* Print leading spaces. */
         size_t strw = str_length(str);
         if (precision == 0)
                 precision = strw;
-
+        
         /* Left padding */
         size_t counter = 0;
@@ -275 +275 @@
                 }
         }
-
+        
         /* Part of @a str fitting into the alloted space. */
         int retval;
@@ -390 +390 @@
          */
         if (flags & __PRINTF_FLAG_PREFIX) {
-                switch(base) {
+                switch (base) {
                 case 2:
                         /* Binary formating is not standard, but usefull */
@@ -454 +454 @@
         /* Print prefix */
         if (flags & __PRINTF_FLAG_PREFIX) {
-                switch(base) {
+                switch (base) {
                 case 2:
                         /* Binary formating is not standard, but usefull */
@@ -569 +569 @@
  *
  *  - P, p Print value of a pointer. Void * value is expected and it is
- *         printed in hexadecimal notation with prefix (as with \%#X / \%#x
- *         for 32-bit or \%#X / \%#x for 64-bit long pointers).
+ *         printed in hexadecimal notation with prefix (as with
+ *         \%#0.8X / \%#0.8x for 32-bit or \%#0.16lX / \%#0.16lx for 64-bit
+ *         long pointers).
  *
  *  - b Print value as unsigned binary number. Prefix is not printed by
@@ -783 +784 @@
                         case 'p':
                                 flags |= __PRINTF_FLAG_PREFIX;
+                                flags |= __PRINTF_FLAG_ZEROPADDED;
                                 base = 16;
                                 qualifier = PrintfQualifierPointer;
@@ -845 +847 @@
                         case PrintfQualifierPointer:
                                 size = sizeof(void *);
-                                number = (uint64_t) (unsigned long) va_arg(ap, void *);
+                                precision = size << 1;
+                                number = (uint64_t) (uintptr_t) va_arg(ap, void *);
                                 break;
                         default: