iliaa Mon Dec 25 16:48:17 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard microtime.c http_fopen_wrapper.c
/php-src/ext/informix ifx.ec
/php-src/ext/exif exif.c
Log:
Use %F (ignores locale) for internal representation of floats
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/microtime.c?r1=1.53.2.2.2.1&r2=1.53.2.2.2.2&diff_format=u
Index: php-src/ext/standard/microtime.c
diff -u php-src/ext/standard/microtime.c:1.53.2.2.2.1
php-src/ext/standard/microtime.c:1.53.2.2.2.2
--- php-src/ext/standard/microtime.c:1.53.2.2.2.1 Fri Nov 3 15:48:39 2006
+++ php-src/ext/standard/microtime.c Mon Dec 25 16:48:17 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: microtime.c,v 1.53.2.2.2.1 2006/11/03 15:48:39 bjori Exp $ */
+/* $Id: microtime.c,v 1.53.2.2.2.2 2006/12/25 16:48:17 iliaa Exp $ */
#include "php.h"
@@ -84,7 +84,7 @@
} else {
char ret[100];
- snprintf(ret, 100, "%.8f %ld", tp.tv_usec / MICRO_IN_SEC,
tp.tv_sec);
+ snprintf(ret, 100, "%.8F %ld", tp.tv_usec / MICRO_IN_SEC,
tp.tv_sec);
RETURN_STRING(ret, 1);
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.2&r2=1.99.2.12.2.3&diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.2
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.3
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.2 Tue Dec 5
18:42:38 2006
+++ php-src/ext/standard/http_fopen_wrapper.c Mon Dec 25 16:48:17 2006
@@ -19,7 +19,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.2 2006/12/05 18:42:38 tony2001 Exp
$ */
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.3 2006/12/25 16:48:17 iliaa Exp $
*/
#include "php.h"
#include "php_globals.h"
@@ -246,7 +246,7 @@
php_stream_context_get_option(context, "http",
"protocol_version", &tmpzval) == SUCCESS) {
SEPARATE_ZVAL(tmpzval);
convert_to_double_ex(tmpzval);
- protocol_version_len = spprintf(&protocol_version, 0, "%.1f",
Z_DVAL_PP(tmpzval));
+ protocol_version_len = spprintf(&protocol_version, 0, "%.1F",
Z_DVAL_PP(tmpzval));
}
if (!scratch) {
http://cvs.php.net/viewvc.cgi/php-src/ext/informix/ifx.ec?r1=1.109.2.7&r2=1.109.2.7.2.1&diff_format=u
Index: php-src/ext/informix/ifx.ec
diff -u php-src/ext/informix/ifx.ec:1.109.2.7
php-src/ext/informix/ifx.ec:1.109.2.7.2.1
--- php-src/ext/informix/ifx.ec:1.109.2.7 Thu May 4 22:48:16 2006
+++ php-src/ext/informix/ifx.ec Mon Dec 25 16:48:17 2006
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ifx.ec,v 1.109.2.7 2006/05/04 22:48:16 tony2001 Exp $ */
+/* $Id: ifx.ec,v 1.109.2.7.2.1 2006/12/25 16:48:17 iliaa Exp $ */
/* -------------------------------------------------------------------
* if you want a function reference : "grep '^\*\*' ifx.ec" will give
@@ -449,7 +449,7 @@
php_info_print_table_row(2, "Active Persistent links", buf);
sprintf(buf, "%ld", IFXG(num_links));
php_info_print_table_row(2, "Active links", buf);
- sprintf(buf, "%02.2f", (double)(IFX_VERSION/100.0));
+ sprintf(buf, "%02.2F", (double)(IFX_VERSION/100.0));
php_info_print_table_row(2, "ESQL/C Version", buf);
php_info_print_table_end();
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.5&r2=1.173.2.5.2.6&diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.5
php-src/ext/exif/exif.c:1.173.2.5.2.6
--- php-src/ext/exif/exif.c:1.173.2.5.2.5 Sat Nov 4 20:46:32 2006
+++ php-src/ext/exif/exif.c Mon Dec 25 16:48:17 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.173.2.5.2.5 2006/11/04 20:46:32 helly Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.6 2006/12/25 16:48:17 iliaa Exp $ */
/* ToDos
*
@@ -139,7 +139,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.5 2006/11/04 20:46:32
helly Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.6 2006/12/25 16:48:17
iliaa Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3914,7 +3914,7 @@
exif_iif_add_int(&ImageInfo, SECTION_COMPUTED,
"ByteOrderMotorola", ImageInfo.motorola_intel TSRMLS_CC);
}
if (ImageInfo.FocalLength) {
- exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "FocalLength"
TSRMLS_CC, "%4.1fmm", ImageInfo.FocalLength);
+ exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED, "FocalLength"
TSRMLS_CC, "%4.1Fmm", ImageInfo.FocalLength);
if(ImageInfo.CCDWidth) {
exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED,
"35mmFocalLength" TSRMLS_CC, "%dmm",
(int)(ImageInfo.FocalLength/ImageInfo.CCDWidth*35+0.5));
}
@@ -3924,19 +3924,19 @@
}
if(ImageInfo.ExposureTime>0) {
if(ImageInfo.ExposureTime <= 0.5) {
- exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED,
"ExposureTime" TSRMLS_CC, "%0.3f s (1/%d)", ImageInfo.ExposureTime, (int)(0.5 +
1/ImageInfo.ExposureTime));
+ exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED,
"ExposureTime" TSRMLS_CC, "%0.3F s (1/%d)", ImageInfo.ExposureTime, (int)(0.5 +
1/ImageInfo.ExposureTime));
} else {
- exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED,
"ExposureTime" TSRMLS_CC, "%0.3f s", ImageInfo.ExposureTime);
+ exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED,
"ExposureTime" TSRMLS_CC, "%0.3F s", ImageInfo.ExposureTime);
}
}
if(ImageInfo.ApertureFNumber) {
- exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED,
"ApertureFNumber" TSRMLS_CC, "f/%.1f", ImageInfo.ApertureFNumber);
+ exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED,
"ApertureFNumber" TSRMLS_CC, "f/%.1F", ImageInfo.ApertureFNumber);
}
if(ImageInfo.Distance) {
if(ImageInfo.Distance<0) {
exif_iif_add_str(&ImageInfo, SECTION_COMPUTED,
"FocusDistance", "Infinite" TSRMLS_CC);
} else {
- exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED,
"FocusDistance" TSRMLS_CC, "%0.2fm", ImageInfo.Distance);
+ exif_iif_add_fmt(&ImageInfo, SECTION_COMPUTED,
"FocusDistance" TSRMLS_CC, "%0.2Fm", ImageInfo.Distance);
}
}
if (ImageInfo.UserComment) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
