iliaa Fri Jan 5 15:06:55 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/fbsql php_fbsql.c
/php-src/ext/gd gd.c
/php-src/ext/ldap ldap.c
/php-src/ext/pdo_firebird firebird_statement.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/soap php_encoding.c
/php-src/ext/standard uniqid.c
/php-src/ext/sysvmsg sysvmsg.c
Log:
%f -> %F
http://cvs.php.net/viewvc.cgi/php-src/ext/fbsql/php_fbsql.c?r1=1.114.2.3.2.4&r2=1.114.2.3.2.5&diff_format=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.4
php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.5
--- php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.4 Mon Jan 1 09:36:00 2007
+++ php-src/ext/fbsql/php_fbsql.c Fri Jan 5 15:06:55 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.c,v 1.114.2.3.2.4 2007/01/01 09:36:00 sebastian Exp $ */
+/* $Id: php_fbsql.c,v 1.114.2.3.2.5 2007/01/05 15:06:55 iliaa Exp $ */
/* TODO:
*
@@ -2893,7 +2893,7 @@
{
double v = *((double*)data);
char b[128];
- snprintf(b, sizeof(b), "%f", v);
+ snprintf(b, sizeof(b), "%F", v);
phpfbestrdup(b, length, value);
}
break;
@@ -2905,7 +2905,7 @@
unsigned scale = fbcdmdScale(dtmd);
double v = *((double*)data);
char b[128];
- snprintf(b, sizeof(b), "%.*f", scale, v);
+ snprintf(b, sizeof(b), "%.*F", scale, v);
phpfbestrdup(b, length, value);
}
break;
@@ -3021,7 +3021,7 @@
{
char b[128];
double seconds = *((double*)data);
- snprintf(b, sizeof(b), "%f", seconds);
+ snprintf(b, sizeof(b), "%F", seconds);
phpfbestrdup(b, length, value);
}
break;
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.12&r2=1.312.2.20.2.13&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.12 php-src/ext/gd/gd.c:1.312.2.20.2.13
--- php-src/ext/gd/gd.c:1.312.2.20.2.12 Mon Jan 1 09:36:01 2007
+++ php-src/ext/gd/gd.c Fri Jan 5 15:06:55 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.12 2007/01/01 09:36:01 sebastian Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.13 2007/01/05 15:06:55 iliaa Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -4276,7 +4276,7 @@
T1_DeleteAllSizes(*f_ind);
if (Z_DVAL_PP(ext) <= 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Second parameter
%f out of range (must be > 0)", Z_DVAL_PP(ext));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Second parameter
%F out of range (must be > 0)", Z_DVAL_PP(ext));
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.2&r2=1.161.2.3.2.3&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.2
php-src/ext/ldap/ldap.c:1.161.2.3.2.3
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.2 Mon Jan 1 09:36:02 2007
+++ php-src/ext/ldap/ldap.c Fri Jan 5 15:06:55 2007
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.161.2.3.2.2 2007/01/01 09:36:02 sebastian Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.3 2007/01/05 15:06:55 iliaa Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -317,7 +317,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.2
2007/01/01 09:36:02 sebastian Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.3
2007/01/05 15:06:55 iliaa Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -342,13 +342,13 @@
#if HAVE_NSLDAP
SDKVersion = ldap_version(&ver);
- snprintf(tmp, 31, "%f", SDKVersion/100.0);
+ snprintf(tmp, 31, "%F", SDKVersion/100.0);
php_info_print_table_row(2, "SDK Version", tmp);
- snprintf(tmp, 31, "%f", ver.protocol_version/100.0);
+ snprintf(tmp, 31, "%F", ver.protocol_version/100.0);
php_info_print_table_row(2, "Highest LDAP Protocol Supported", tmp);
- snprintf(tmp, 31, "%f", ver.SSL_version/100.0);
+ snprintf(tmp, 31, "%F", ver.SSL_version/100.0);
php_info_print_table_row(2, "SSL Level Supported", tmp);
if (ver.security_level != LDAP_SECURITY_NONE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/firebird_statement.c?r1=1.18.2.1.2.1&r2=1.18.2.1.2.2&diff_format=u
Index: php-src/ext/pdo_firebird/firebird_statement.c
diff -u php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.1
php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.2
--- php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.1 Mon Jan 1
09:36:04 2007
+++ php-src/ext/pdo_firebird/firebird_statement.c Fri Jan 5 15:06:55 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: firebird_statement.c,v 1.18.2.1.2.1 2007/01/01 09:36:04 sebastian Exp
$ */
+/* $Id: firebird_statement.c,v 1.18.2.1.2.2 2007/01/05 15:06:55 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -366,11 +366,11 @@
break;
case SQL_FLOAT:
*ptr = FETCH_BUF(S->fetch_buf[colno],
char, 24, NULL);
- *len = sprintf(*ptr, "%f",
*(float*)var->sqldata);
+ *len = sprintf(*ptr, "%F",
*(float*)var->sqldata);
break;
case SQL_DOUBLE:
*ptr = FETCH_BUF(S->fetch_buf[colno],
char, 24, NULL);
- *len = sprintf(*ptr, "%f" ,
*(double*)var->sqldata);
+ *len = sprintf(*ptr, "%F" ,
*(double*)var->sqldata);
break;
/* --- cut here --- */
#if abies_0
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.15&r2=1.331.2.13.2.16&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.15
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.16
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.15 Mon Jan 1 09:36:05 2007
+++ php-src/ext/pgsql/pgsql.c Fri Jan 5 15:06:55 2007
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.331.2.13.2.15 2007/01/01 09:36:05 sebastian Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.16 2007/01/05 15:06:55 iliaa Exp $ */
#include <stdlib.h>
@@ -5383,7 +5383,7 @@
smart_str_append_long(&querystr,
Z_LVAL_PP(val));
break;
case IS_DOUBLE:
- smart_str_appendl(&querystr, buf, snprintf(buf,
sizeof(buf), "%f", Z_DVAL_PP(val)));
+ smart_str_appendl(&querystr, buf, snprintf(buf,
sizeof(buf), "%F", Z_DVAL_PP(val)));
break;
default:
/* should not happen */
@@ -5485,7 +5485,7 @@
smart_str_append_long(querystr, Z_LVAL_PP(val));
break;
case IS_DOUBLE:
- smart_str_appendl(querystr, buf,
MIN(snprintf(buf, sizeof(buf), "%f", Z_DVAL_PP(val)), sizeof(buf)-1));
+ smart_str_appendl(querystr, buf,
MIN(snprintf(buf, sizeof(buf), "%F", Z_DVAL_PP(val)), sizeof(buf)-1));
break;
default:
/* should not happen */
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.20&r2=1.103.2.21.2.21&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.20
php-src/ext/soap/php_encoding.c:1.103.2.21.2.21
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.20 Mon Jan 1 09:36:06 2007
+++ php-src/ext/soap/php_encoding.c Fri Jan 5 15:06:55 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.20 2007/01/01 09:36:06 sebastian Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.21 2007/01/05 15:06:55 iliaa Exp $ */
#include <time.h>
@@ -937,7 +937,7 @@
if (Z_TYPE_P(data) == IS_DOUBLE) {
char s[256];
- sprintf(s, "%0.0f",floor(Z_DVAL_P(data)));
+ sprintf(s, "%0.0F",floor(Z_DVAL_P(data)));
xmlNodeSetContent(ret, BAD_CAST(s));
} else {
zval tmp = *data;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/uniqid.c?r1=1.41.2.2.2.1&r2=1.41.2.2.2.2&diff_format=u
Index: php-src/ext/standard/uniqid.c
diff -u php-src/ext/standard/uniqid.c:1.41.2.2.2.1
php-src/ext/standard/uniqid.c:1.41.2.2.2.2
--- php-src/ext/standard/uniqid.c:1.41.2.2.2.1 Mon Jan 1 09:36:09 2007
+++ php-src/ext/standard/uniqid.c Fri Jan 5 15:06:55 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: uniqid.c,v 1.41.2.2.2.1 2007/01/01 09:36:09 sebastian Exp $ */
+/* $Id: uniqid.c,v 1.41.2.2.2.2 2007/01/05 15:06:55 iliaa Exp $ */
#include "php.h"
@@ -76,7 +76,7 @@
* digits for usecs.
*/
if (more_entropy) {
- spprintf(&uniqid, 0, "%s%08x%05x%.8f", prefix, sec, usec,
php_combined_lcg(TSRMLS_C) * 10);
+ spprintf(&uniqid, 0, "%s%08x%05x%.8F", prefix, sec, usec,
php_combined_lcg(TSRMLS_C) * 10);
} else {
spprintf(&uniqid, 0, "%s%08x%05x", prefix, sec, usec);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.20.2.3.2.3&r2=1.20.2.3.2.4&diff_format=u
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.3
php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.4
--- php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.3 Mon Jan 1 09:36:09 2007
+++ php-src/ext/sysvmsg/sysvmsg.c Fri Jan 5 15:06:55 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvmsg.c,v 1.20.2.3.2.3 2007/01/01 09:36:09 sebastian Exp $ */
+/* $Id: sysvmsg.c,v 1.20.2.3.2.4 2007/01/05 15:06:55 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -144,7 +144,7 @@
{
php_info_print_table_start();
php_info_print_table_row(2, "sysvmsg support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.20.2.3.2.3 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.20.2.3.2.4 $");
php_info_print_table_end();
}
/* }}} */
@@ -412,7 +412,7 @@
break;
case IS_DOUBLE:
- message_len = spprintf(&p, 0, "%f",
Z_DVAL_P(message));
+ message_len = spprintf(&p, 0, "%F",
Z_DVAL_P(message));
break;
default:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
