]> granicus.if.org Git - php/commitdiff
%f -> %F
authorIlia Alshanetsky <iliaa@php.net>
Fri, 5 Jan 2007 15:06:55 +0000 (15:06 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Fri, 5 Jan 2007 15:06:55 +0000 (15:06 +0000)
ext/fbsql/php_fbsql.c
ext/gd/gd.c
ext/ldap/ldap.c
ext/pdo_firebird/firebird_statement.c
ext/pgsql/pgsql.c
ext/soap/php_encoding.c
ext/standard/uniqid.c
ext/sysvmsg/sysvmsg.c

index d980e64a3473b82f4df3aa26546a22d7ea80199a..27f11589bacbbb144850a8e5111bf34226d94788 100644 (file)
@@ -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;
index cc424feb9ea1efe2c562c364e12c2aeb15e9fed6..d7d6dbb583770b2ba8782da1bfde698a76af2591 100644 (file)
@@ -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;
        }
 
index 298845c0a70bec3993f2ac520d59c4601582a524..781a5d7205a2065d0d307996cae6ed5a1f14499e 100644 (file)
@@ -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) {
index d6ae8d17d6fd66a855d5f92212066db2dcf1d85b..f48acfdbb68be3754501c1156bfde3954d216964 100644 (file)
@@ -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
index e83250b6778fdfab6b0420887c9d99f05f8e1f7b..e5c9fd823fca9114ee78de8e6fdb68b6c6bc28ad 100644 (file)
@@ -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 */
index d2f6722cb9ae6690fccb0105077cf410da35e1bb..aa2b98e887dc293a5aa5c0c8cb2c59dff569ec80 100644 (file)
@@ -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;
index 279758835b413b214b157cc22475e6ec13f560ad..b9888e4c10b78d12c7a0c019ab9726535e5a5f9c 100644 (file)
@@ -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);
        }
index 4292280d21c31db5c8efc3de093e027be3a20e9f..49e63e3ec78e62842fd74086ea4687f23d0665c3 100644 (file)
@@ -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: