tony2001                Fri Jul 13 15:52:38 2007 UTC

  Modified files:              
    /php-src/ext/standard       formatted_print.c 
    /php-src/ext/standard/tests/array   bug35014_64bit.phpt 
  Log:
  fix %u in Unicode mode
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.101&r2=1.102&diff_format=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.101 
php-src/ext/standard/formatted_print.c:1.102
--- php-src/ext/standard/formatted_print.c:1.101        Sun Jun  3 09:11:52 2007
+++ php-src/ext/standard/formatted_print.c      Fri Jul 13 15:52:38 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: formatted_print.c,v 1.101 2007/06/03 09:11:52 shire Exp $ */
+/* $Id: formatted_print.c,v 1.102 2007/07/13 15:52:38 tony2001 Exp $ */
 
 #include <math.h>                              /* modf() */
 #include "php.h"
@@ -308,7 +308,7 @@
        register unsigned long magn, nmagn;
        register unsigned int i = NUM_BUF_SIZE - 1;
 
-       magn = (unsigned int) number;
+       magn = (unsigned long) number;
 
        /* Can't right-pad 0's on integers */
        if (alignment == 0 && padding == 0x30 /* '0' */) padding = 0x20 /* ' ' 
*/;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug35014_64bit.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/standard/tests/array/bug35014_64bit.phpt
diff -u php-src/ext/standard/tests/array/bug35014_64bit.phpt:1.4 
php-src/ext/standard/tests/array/bug35014_64bit.phpt:1.5
--- php-src/ext/standard/tests/array/bug35014_64bit.phpt:1.4    Mon Jun  4 
01:23:22 2007
+++ php-src/ext/standard/tests/array/bug35014_64bit.phpt        Fri Jul 13 
15:52:38 2007
@@ -31,8 +31,8 @@
 int(9)
 float(1)
 int(9999999800000001)
-float(2.8404260053903E+20)
-int(8589934590)
+float(1.219953680145E+30)
+float(3.6893488147419E+19)
 --UEXPECTF--
 Warning: array_product() expects parameter 1 to be array, Unicode string given 
in %s on line %d
 NULL

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

Reply via email to