iliaa           Sun Jul 18 13:27:49 2004 EDT

  Added files:                 
    /php-src/ext/standard/tests/strings bug28633.phpt 

  Modified files:              
    /php-src/ext/standard       formatted_print.c 
    /php-src/ext/standard/tests/strings bug22207.phpt 
  Log:
  Fixed bug #28633 (sprintf incorrectly adding padding to floats).
  
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/formatted_print.c?r1=1.77&r2=1.78&ty=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.77 
php-src/ext/standard/formatted_print.c:1.78
--- php-src/ext/standard/formatted_print.c:1.77 Wed May 19 12:46:29 2004
+++ php-src/ext/standard/formatted_print.c      Sun Jul 18 13:27:49 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: formatted_print.c,v 1.77 2004/05/19 16:46:29 abies Exp $ */
+/* $Id: formatted_print.c,v 1.78 2004/07/18 17:27:49 iliaa Exp $ */
 
 #include <math.h>                              /* modf() */
 #include "php.h"
@@ -398,9 +398,6 @@
 
        numbuf[i] = '\0';
 
-       if (precision > 0) {
-               width += (precision + 1);
-       }
        php_sprintf_appendstring(buffer, pos, size, numbuf, width, 0, padding,
                                                         alignment, i, sign, 0, 
always_sign);
 }
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/bug22207.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/standard/tests/strings/bug22207.phpt
diff -u php-src/ext/standard/tests/strings/bug22207.phpt:1.1 
php-src/ext/standard/tests/strings/bug22207.phpt:1.2
--- php-src/ext/standard/tests/strings/bug22207.phpt:1.1        Thu Feb 13 12:25:31 
2003
+++ php-src/ext/standard/tests/strings/bug22207.phpt    Sun Jul 18 13:27:49 2004
@@ -7,5 +7,5 @@
 ?>
 --EXPECT--
 1.1000e+0
-string(17) "       1.1000e+0
+string(11) " 1.1000e+0
 "

http://cvs.php.net/co.php/php-src/ext/standard/tests/strings/bug28633.phpt?r=1.1&p=1
Index: php-src/ext/standard/tests/strings/bug28633.phpt
+++ php-src/ext/standard/tests/strings/bug28633.phpt
--TEST--
Bug #28633 (sprintf incorrectly adding padding to floats)
--FILE--
<?php
        echo sprintf("%05.2f", 0.02) . "\n";
        echo sprintf("%05.2f", 2.02) . "\n";
?>
--EXPECT--
00.02
02.02

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to