From 7d901eacbe756eb6108c253245a65b7bcaa62b0e Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Fri, 5 Jan 2007 15:06:55 +0000 Subject: [PATCH] %f -> %F --- ext/fbsql/php_fbsql.c | 6 +++--- ext/gd/gd.c | 2 +- ext/ldap/ldap.c | 6 +++--- ext/pdo_firebird/firebird_statement.c | 4 ++-- ext/pgsql/pgsql.c | 4 ++-- ext/soap/php_encoding.c | 2 +- ext/standard/uniqid.c | 2 +- ext/sysvmsg/sysvmsg.c | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c index d980e64a34..27f11589ba 100644 --- a/ext/fbsql/php_fbsql.c +++ b/ext/fbsql/php_fbsql.c @@ -2893,7 +2893,7 @@ void phpfbColumnAsString(PHPFBResult* result, int column, void* data , int* leng { 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 @@ void phpfbColumnAsString(PHPFBResult* result, int column, void* data , int* leng 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 @@ void phpfbColumnAsString(PHPFBResult* result, int column, void* data , int* leng { char b[128]; double seconds = *((double*)data); - snprintf(b, sizeof(b), "%f", seconds); + snprintf(b, sizeof(b), "%F", seconds); phpfbestrdup(b, length, value); } break; diff --git a/ext/gd/gd.c b/ext/gd/gd.c index cc424feb9e..d7d6dbb583 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -4276,7 +4276,7 @@ PHP_FUNCTION(imagepsextendfont) 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; } diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 298845c0a7..781a5d7205 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -342,13 +342,13 @@ PHP_MINFO_FUNCTION(ldap) #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) { diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c index d6ae8d17d6..f48acfdbb6 100644 --- a/ext/pdo_firebird/firebird_statement.c +++ b/ext/pdo_firebird/firebird_statement.c @@ -366,11 +366,11 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{ 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 diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index e83250b677..e5c9fd823f 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -5383,7 +5383,7 @@ PHP_PGSQL_API int php_pgsql_insert(PGconn *pg_link, const char *table, zval *var 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 @@ static inline int build_assignment_string(smart_str *querystr, HashTable *ht, co 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 */ diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index d2f6722cb9..aa2b98e887 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -937,7 +937,7 @@ static xmlNodePtr to_xml_long(encodeTypePtr type, zval *data, int style, xmlNode 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; diff --git a/ext/standard/uniqid.c b/ext/standard/uniqid.c index 279758835b..b9888e4c10 100644 --- a/ext/standard/uniqid.c +++ b/ext/standard/uniqid.c @@ -76,7 +76,7 @@ PHP_FUNCTION(uniqid) * 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); } diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c index 4292280d21..49e63e3ec7 100644 --- a/ext/sysvmsg/sysvmsg.c +++ b/ext/sysvmsg/sysvmsg.c @@ -412,7 +412,7 @@ PHP_FUNCTION(msg_send) 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: -- 2.40.0