com php-src: We might as well re-use the TSRMLS parameters here as they are available in PHP_FUNCTION anyway to save a TSRMLS _FETCH() call:
sapi/apache_hooks/php_apache.c

From: Date: Wed, 18 Dec 2013 08:10:45 +0000
Subject: com php-src: We might as well re-use the TSRMLS parameters here as they are available in PHP_FUNCTION anyway to save a TSRMLS _FETCH() call:
sapi/apache_hooks/php_apache.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74492@lists.php.net to get a copy of this message
Commit: f883d3cc7a9162146dd50aca3a87dd8f090aec3c Author: Kalle Sommer Nielsen <kalle@php.net> Wed, 18 Dec 2013 09:10:45 +0100 Parents: ed5a8d510f6e4ae865008fe711efbbc5452adf42 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f883d3cc7a9162146dd50aca3a87dd8f090aec3c Log: We might as well re-use the TSRMLS parameters here as they are available in PHP_FUNCTION anyway to save a TSRMLS_FETCH() call Changed paths: M sapi/apache_hooks/php_apache.c Diff: diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c index dde6d88..f2a49b7 100644 --- a/sapi/apache_hooks/php_apache.c +++ b/sapi/apache_hooks/php_apache.c @@ -155,15 +155,13 @@ static request_rec *get_apache_request(zval *z TSRMLS_DC) return r; } -/* {{{ php_apache_request_new(request_rec *r) +/* {{{ php_apache_request_new(request_rec *r TSRMLS_DC) * create a new zval-instance for ApacheRequest that wraps request_rec */ -zval *php_apache_request_new(request_rec *r) +zval *php_apache_request_new(request_rec *r TSRMLS_DC) { zval *req; zval *addr; - - TSRMLS_FETCH(); MAKE_STD_ZVAL(addr); Z_TYPE_P(addr) = IS_LONG; @@ -1170,7 +1168,7 @@ PHP_FUNCTION(apache_request_sub_req_lookup_uri) if (!sub_r) { RETURN_FALSE; } - return_value = php_apache_request_new(sub_r); + return_value = php_apache_request_new(sub_r TSRMLS_CC); } /* }}} */ @@ -1196,7 +1194,7 @@ PHP_FUNCTION(apache_request_sub_req_lookup_file) if (!sub_r) { RETURN_FALSE; } - return_value = php_apache_request_new(sub_r); + return_value = php_apache_request_new(sub_r TSRMLS_CC); } /* }}} */ @@ -1222,7 +1220,7 @@ PHP_FUNCTION(apache_request_sub_req_method_uri) if (!sub_r) { RETURN_FALSE; } - return_value = php_apache_request_new(sub_r); + return_value = php_apache_request_new(sub_r TSRMLS_CC); } /* }}} */

« previous php.cvs (#74492) next »