diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-12-19 13:15:39 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-12-19 13:15:39 +0000 |
| commit | c34d863d3e2e0db9d83a80164f6b1e8b82c0a031 (patch) | |
| tree | 1ae0e8b680b2eb564eae10278bcf328ed8e8ec6b | |
| parent | 5d8183f0b22e72ce8fc3cb632ecfd253a634c6c3 (diff) | |
| download | php-git-c34d863d3e2e0db9d83a80164f6b1e8b82c0a031.tar.gz | |
MFH
| -rw-r--r-- | ext/pcre/tests/002.phpt | 2 | ||||
| -rw-r--r-- | main/snprintf.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/pcre/tests/002.phpt b/ext/pcre/tests/002.phpt index a7f588397d..726390c77e 100644 --- a/ext/pcre/tests/002.phpt +++ b/ext/pcre/tests/002.phpt @@ -34,7 +34,7 @@ string(12) "a${1b${1c${1" Warning: preg_replace(): Compilation failed: missing terminating ] for character class at offset 8 in %s002.php on line 11 NULL -Parse error: %s, unexpected T_FOR in %s002.php(12) : regexp code on line 1 +Parse error: %s in %s002.php(12) : regexp code on line 1 Fatal error: preg_replace(): Failed evaluating code: for ($ in %s002.php on line 12 diff --git a/main/snprintf.c b/main/snprintf.c index f3f6dae90b..c019d1a2fa 100644 --- a/main/snprintf.c +++ b/main/snprintf.c @@ -93,7 +93,7 @@ static char * __cvt(double value, int ndigit, int *decpt, int *sign, int fmode, *decpt = 0; c = *p; zend_freedtoa(p); - return(c == 'I' ? "inf" : "nan"); + return(c == 'I' ? "INF" : "NAN"); } /* Make a local copy and adjust rve to be in terms of s */ if (pad && fmode) @@ -140,7 +140,7 @@ PHPAPI char *php_gcvt(double value, int ndigit, char dec_point, char exponent, c * We assume the buffer is at least ndigit long. */ snprintf(buf, ndigit + 1, "%s%s", sign ? "-" : "", - *digits == 'I' ? "inf" : "nan"); + *digits == 'I' ? "INF" : "NAN"); zend_freedtoa(digits); return (buf); } @@ -941,10 +941,10 @@ static int format_converter(register buffy * odp, const char *fmt, } if (zend_isnan(fp_num)) { - s = "nan"; + s = "NAN"; s_len = 3; } else if (zend_isinf(fp_num)) { - s = "inf"; + s = "INF"; s_len = 3; } else { #ifdef HAVE_LOCALE_H |