svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/reentrancy.c branches/PHP_5_4/main/reentrancy.c trunk/main/reentrancy.c

iliaa Mon, 11 Jul 2011 17:01:23 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=313144 Log: Fixed bug #55014 (Compile failure due to improper use of ctime_r()). Bug: https://bugs.php.net/55014 (Open) Error Compiling: too many arguments to function `ctime_r' Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/main/reentrancy.c U php/php-src/branches/PHP_5_4/main/reentrancy.c U php/php-src/trunk/main/reentrancy.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-07-11 17:00:04 UTC (rev 313143) +++ php/php-src/branches/PHP_5_3/NEWS 2011-07-11 17:01:23 UTC (rev 313144) @@ -6,6 +6,7 @@ though the class has none). (Felipe) - Core + . Fixed bug #55014 (Compile failure due to improper use of ctime_r()). (Ilia) . Fixed bug #54332 (Crash in zend_mm_check_ptr // Heap corruption). (Dmitry) . Fixed bug #54305 (Crash in gc_remove_zval_from_buffer). (Dmitry) . Fixed bug #53727 (Inconsistent behavior of is_subclass_of with interfaces) Modified: php/php-src/branches/PHP_5_3/main/reentrancy.c =================================================================== --- php/php-src/branches/PHP_5_3/main/reentrancy.c 2011-07-11 17:00:04 UTC (rev 313143) +++ php/php-src/branches/PHP_5_3/main/reentrancy.c 2011-07-11 17:01:23 UTC (rev 313144) @@ -60,14 +60,14 @@ PHPAPI char *php_ctime_r(const time_t *clock, char *buf) { - if (ctime_r(clock, buf, 26) == buf) + if (ctime_r(clock, buf) == buf) return (buf); return (NULL); } PHPAPI char *php_asctime_r(const struct tm *tm, char *buf) { - if (asctime_r(tm, buf, 26) == buf) + if (asctime_r(tm, buf) == buf) return (buf); return (NULL); } Modified: php/php-src/branches/PHP_5_4/main/reentrancy.c =================================================================== --- php/php-src/branches/PHP_5_4/main/reentrancy.c 2011-07-11 17:00:04 UTC (rev 313143) +++ php/php-src/branches/PHP_5_4/main/reentrancy.c 2011-07-11 17:01:23 UTC (rev 313144) @@ -60,14 +60,14 @@ PHPAPI char *php_ctime_r(const time_t *clock, char *buf) { - if (ctime_r(clock, buf, 26) == buf) + if (ctime_r(clock, buf) == buf) return (buf); return (NULL); } PHPAPI char *php_asctime_r(const struct tm *tm, char *buf) { - if (asctime_r(tm, buf, 26) == buf) + if (asctime_r(tm, buf) == buf) return (buf); return (NULL); } Modified: php/php-src/trunk/main/reentrancy.c =================================================================== --- php/php-src/trunk/main/reentrancy.c 2011-07-11 17:00:04 UTC (rev 313143) +++ php/php-src/trunk/main/reentrancy.c 2011-07-11 17:01:23 UTC (rev 313144) @@ -60,14 +60,14 @@ PHPAPI char *php_ctime_r(const time_t *clock, char *buf) { - if (ctime_r(clock, buf, 26) == buf) + if (ctime_r(clock, buf) == buf) return (buf); return (NULL); } PHPAPI char *php_asctime_r(const struct tm *tm, char *buf) { - if (asctime_r(tm, buf, 26) == buf) + if (asctime_r(tm, buf) == buf) return (buf); return (NULL); }