merged branch pierrejoye/master (PR #855)

This PR was merged into the master branch.

Commits
-------

d398e55 - drop tsrm fetch, not necessary as it is passed as argument already

Discussion
----------

drop unnecessary tsrmls_fetch
This commit is contained in:
Fabien Potencier
2012-10-08 15:20:00 +02:00
-3
View File
@@ -514,7 +514,6 @@ static int twig_add_array_key_to_string(void *pDest APPLY_TSRMLS_DC, int num_arg
{
smart_str *buf;
char *joiner;
APPLY_TSRMLS_FETCH();
buf = va_arg(args, smart_str*);
joiner = va_arg(args, char*);
@@ -586,7 +585,6 @@ static int twig_add_method_to_class(void *pDest APPLY_TSRMLS_DC, int num_args, v
char *item;
size_t item_len;
zend_function *mptr = (zend_function *) pDest;
APPLY_TSRMLS_FETCH();
if (!(mptr->common.fn_flags & ZEND_ACC_PUBLIC)) {
return 0;
@@ -609,7 +607,6 @@ static int twig_add_property_to_class(void *pDest APPLY_TSRMLS_DC, int num_args,
zval *retval;
char *class_name, *prop_name;
zend_property_info *pptr = (zend_property_info *) pDest;
APPLY_TSRMLS_FETCH();
if (!(pptr->flags & ZEND_ACC_PUBLIC)) {
return 0;