cvs: php-src /main snprintf.c spprintf.c

dmitry Mon Jun 25 08:39:24 2007 UTC Modified files: /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.56&r2=1.57&diff_format=u Index: php-src/main/snprintf.c diff -u php-src/main/snprintf.c:1.56 php-src/main/snprintf.c:1.57 --- php-src/main/snprintf.c:1.56 Tue Jun 19 12:19:27 2007 +++ php-src/main/snprintf.c Mon Jun 25 08:39:23 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: snprintf.c,v 1.56 2007/06/19 12:19:27 derick Exp $ */ +/* $Id: snprintf.c,v 1.57 2007/06/25 08:39:23 dmitry Exp $ */ #include "php.h" @@ -1082,7 +1082,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.45&r2=1.46&diff_format=u Index: php-src/main/spprintf.c diff -u php-src/main/spprintf.c:1.45 php-src/main/spprintf.c:1.46 --- php-src/main/spprintf.c:1.45 Tue Jun 19 12:19:27 2007 +++ php-src/main/spprintf.c Mon Jun 25 08:39:23 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spprintf.c,v 1.45 2007/06/19 12:19:27 derick Exp $ */ +/* $Id: spprintf.c,v 1.46 2007/06/25 08:39:23 dmitry Exp $ */ /* This is the spprintf implementation. * It has emerged from apache snprintf. See original header: @@ -709,7 +709,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)