cvs: php-src(PHP_5_2) /main snprintf.c spprintf.c

dmitry Mon Jun 25 08:39:10 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/main snprintf.c spprintf.c Log: Restore big exponent letter in var_export() ('1e300' -> '1E300') http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.37.2.4.2.12&r2=1.37.2.4.2.13&diff_format=u Index: php-src/main/snprintf.c diff -u php-src/main/snprintf.c:1.37.2.4.2.12 php-src/main/snprintf.c:1.37.2.4.2.13 --- php-src/main/snprintf.c:1.37.2.4.2.12 Tue Jun 19 12:20:50 2007 +++ php-src/main/snprintf.c Mon Jun 25 08:39:10 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: snprintf.c,v 1.37.2.4.2.12 2007/06/19 12:20:50 derick Exp $ */ +/* $Id: snprintf.c,v 1.37.2.4.2.13 2007/06/25 08:39:10 dmitry Exp $ */ #include "php.h" @@ -1036,7 +1036,7 @@ lconv = localeconv(); } #endif - s = php_gcvt(fp_num, precision, *fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G')?'E':'e', &num_buf[1]); + s = php_gcvt(fp_num, precision, *fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G' || *fmt == 'H')?'E':'e', &num_buf[1]); if (*s == '-') { prefix_char = *s++; } else if (print_sign) { http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.25.2.2.2.6&r2=1.25.2.2.2.7&diff_format=u Index: php-src/main/spprintf.c diff -u php-src/main/spprintf.c:1.25.2.2.2.6 php-src/main/spprintf.c:1.25.2.2.2.7 --- php-src/main/spprintf.c:1.25.2.2.2.6 Tue Jun 19 12:20:50 2007 +++ php-src/main/spprintf.c Mon Jun 25 08:39:10 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spprintf.c,v 1.25.2.2.2.6 2007/06/19 12:20:50 derick Exp $ */ +/* $Id: spprintf.c,v 1.25.2.2.2.7 2007/06/25 08:39:10 dmitry Exp $ */ /* This is the spprintf implementation. * It has emerged from apache snprintf. See original header: @@ -619,7 +619,7 @@ lconv = localeconv(); } #endif - s = php_gcvt(fp_num, precision, *fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G')?'E':'e', &num_buf[1]); + s = php_gcvt(fp_num, precision, *fmt=='H' ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G' || *fmt == 'H')?'E':'e', &num_buf[1]); if (*s == '-') prefix_char = *s++; else if (print_sign)