kalle Mon, 27 Sep 2010 01:19:57 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=303773
Log:
Removed a TSRMLS_FETCH() call in php_idate() in favor of the TSRMLS macros
Changed paths:
U php/php-src/trunk/UPGRADING.INTERNALS
U php/php-src/trunk/ext/date/php_date.c
U php/php-src/trunk/ext/date/php_date.h
Modified: php/php-src/trunk/UPGRADING.INTERNALS
===================================================================
--- php/php-src/trunk/UPGRADING.INTERNALS 2010-09-26 20:46:54 UTC (rev
303772)
+++ php/php-src/trunk/UPGRADING.INTERNALS 2010-09-27 01:19:57 UTC (rev
303773)
@@ -99,4 +99,8 @@
. php_get_current_user
PHPAPI php_get_current_user(TSRMLS_D)
- Call: char *user = php_get_current_user(TSRMLS_C);
\ No newline at end of file
+ Call: char *user = php_get_current_user(TSRMLS_C);
+
+. php_idate
+ PHPAPI php_idate(char format, time_t ts, int localtime TSRMLS_DC)
+ Call: int ret = php_idate(format, ts, localtime TSRMLS_CC)
\ No newline at end of file
Modified: php/php-src/trunk/ext/date/php_date.c
===================================================================
--- php/php-src/trunk/ext/date/php_date.c 2010-09-26 20:46:54 UTC (rev
303772)
+++ php/php-src/trunk/ext/date/php_date.c 2010-09-27 01:19:57 UTC (rev
303773)
@@ -1203,7 +1203,7 @@
/* {{{ php_idate
*/
-PHPAPI int php_idate(char format, time_t ts, int localtime)
+PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC)
{
timelib_time *t;
timelib_tzinfo *tzi;
@@ -1214,7 +1214,6 @@
t = timelib_time_ctor();
if (!localtime) {
- TSRMLS_FETCH();
tzi = get_timezone_info(TSRMLS_C);
t->tz_info = tzi;
t->zone_type = TIMELIB_ZONETYPE_ID;
@@ -1336,7 +1335,7 @@
ts = time(NULL);
}
- ret = php_idate(format[0], ts, 0);
+ ret = php_idate(format[0], ts, 0 TSRMLS_CC);
if (ret == -1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized date
format token.");
RETURN_FALSE;
Modified: php/php-src/trunk/ext/date/php_date.h
===================================================================
--- php/php-src/trunk/ext/date/php_date.h 2010-09-26 20:46:54 UTC (rev
303772)
+++ php/php-src/trunk/ext/date/php_date.h 2010-09-27 01:19:57 UTC (rev
303773)
@@ -163,7 +163,7 @@
/* Backwards compability wrapper */
PHPAPI signed long php_parse_date(char *string, signed long *now);
PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt);
-PHPAPI int php_idate(char format, time_t ts, int localtime);
+PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC);
#if HAVE_STRFTIME
#define _php_strftime php_strftime
PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gm);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
