commit 7251c04f41fab8d8050ab7cb4aa7affd136d7ae0
author Farid Zaripov <faridz@apache.org> Wed Apr 30 15:24:10 2008 +0000
committer Farid Zaripov <faridz@apache.org> Wed Apr 30 15:24:10 2008 +0000
tree 50fdbbb30bbe99bf4d7b698704944aaca9b57aa2
parent 86515e2a09cc8dac4f15545e54219c2c2a95cdd4

2008-04-30 Farid Zaripov <farid_zaripov@epam.com>

	* tests/src/printf.cpp (__rw_fmtfloating): Process width and precision
	specifiers before the size specifiers.
	[_MSC_VER]: Decrement len after removing redundant zero.


git-svn-id: https://svn.apache.org/repos/asf/stdcxx/trunk@652396 13f79535-47bb-0310-9956-ffa450edef68

tests/src/printf.cpp

diff --git a/tests/src/printf.cpp b/tests/src/printf.cpp
index 872617f..7c23f8e 100644
--- a/tests/src/printf.cpp
+++ b/tests/src/printf.cpp
@@ -1424,6 +1424,13 @@
     if (spec.fl_zero)
         *pf++ = '0';
 
+    if (spec.mod != spec.mod_ext_A && 0 <= spec.width) {
+        pf += sprintf (pf, "%i", spec.width);
+    }
+
+    if (0 <= spec.prec)
+        pf += sprintf (pf, ".%i", spec.prec);
+
     if (spec.mod == spec.mod_h)
         *pf++ = 'h';
     else if (spec.mod == spec.mod_hh) {
@@ -1451,13 +1458,6 @@
         pf += strlen (pf);
     }
 
-    if (spec.mod != spec.mod_ext_A && 0 <= spec.width) {
-        pf += sprintf (pf, "%i", spec.width);
-    }
-
-    if (0 <= spec.prec)
-        pf += sprintf (pf, ".%i", spec.prec);
-
     *pf++ = char (spec.cvtspec);
     *pf   = '\0';
 
@@ -1499,6 +1499,7 @@
             buffer [len - 3] = buffer [len - 2];
             buffer [len - 2] = buffer [len - 1];
             buffer [len - 1] = buffer [len];
+            --len;
         }
     }