Changeset cdafab1 in mainline

Timestamp:

2006-04-23T15:04:08Z (19 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

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

Children:

d3b8c1f

Parents:

34c4d69

Message:

Printf precision is counted without prefixes now.

File:

• libc/generic/io/print.c (modified) (4 diffs)

libc/generic/io/print.c

@@ -166 +166 @@
         char d[PRINT_NUMBER_BUFFER_SIZE];       /* this is good enough even for base == 2, prefix and sign */
         char *ptr = &d[PRINT_NUMBER_BUFFER_SIZE - 1];
-        int size = 0;
+        int size = 0; /* size of number with all prefixes and signs */
+        int number_size; /* size of plain number */
         int written = 0;
         char sgn;
@@ -184 +185 @@
                 } while (num /= base);
         }
-
+        
+        number_size = size;
+        
         /* Collect sum of all prefixes/signs/... to calculate padding and leading zeroes */
         if (flags & __PRINTF_FLAG_PREFIX) {
@@ -221 +224 @@
         if (flags & __PRINTF_FLAG_ZEROPADDED) {
                 if ((precision == 0) && (width > size)) {
-                        precision = width - size;
+                        precision = width - size + number_size;
                 }
         }
 
         /* print leading spaces */
-        if (size > precision) /* We must print whole number not only a part */
-                precision = size;
-
-        width -= precision;
+        if (number_size > precision) /* We must print whole number not only a part */
+                precision = number_size;
+
+        width -= precision + size - number_size;
         
         if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) {
@@ -274 +277 @@
 
         /* print leading zeroes */
-        precision -= size;
+        precision -= number_size;
         while (precision-- > 0) {       
                 putchar('0');