Return-Path: Delivered-To: apmail-stdcxx-commits-archive@www.apache.org Received: (qmail 11139 invoked from network); 30 Apr 2008 15:24:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Apr 2008 15:24:33 -0000 Received: (qmail 25871 invoked by uid 500); 30 Apr 2008 15:24:35 -0000 Delivered-To: apmail-stdcxx-commits-archive@stdcxx.apache.org Received: (qmail 25853 invoked by uid 500); 30 Apr 2008 15:24:35 -0000 Mailing-List: contact commits-help@stdcxx.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@stdcxx.apache.org Delivered-To: mailing list commits@stdcxx.apache.org Received: (qmail 25841 invoked by uid 99); 30 Apr 2008 15:24:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Apr 2008 08:24:35 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Apr 2008 15:23:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 40F6723889BB; Wed, 30 Apr 2008 08:24:11 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r652396 - /stdcxx/trunk/tests/src/printf.cpp Date: Wed, 30 Apr 2008 15:24:11 -0000 To: commits@stdcxx.apache.org From: faridz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080430152411.40F6723889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: faridz Date: Wed Apr 30 08:24:10 2008 New Revision: 652396 URL: http://svn.apache.org/viewvc?rev=652396&view=rev Log: 2008-04-30 Farid Zaripov * tests/src/printf.cpp (__rw_fmtfloating): Process width and precision specifiers before the size specifiers. [_MSC_VER]: Decrement len after removing redundant zero. Modified: stdcxx/trunk/tests/src/printf.cpp Modified: stdcxx/trunk/tests/src/printf.cpp URL: http://svn.apache.org/viewvc/stdcxx/trunk/tests/src/printf.cpp?rev=652396&r1=652395&r2=652396&view=diff ============================================================================== --- stdcxx/trunk/tests/src/printf.cpp (original) +++ stdcxx/trunk/tests/src/printf.cpp Wed Apr 30 08:24:10 2008 @@ -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; } }