[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/xsl/xsltprocessor.c trunk/ext/xsl/xsltprocessor.c
iliaaMon, 08 Aug 2011 16:49:43 + Revision: http://svn.php.net/viewvc?view=revision&revision=314564 Log: Another build fix relating to previous DOM commit Changed paths: U php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c U php/php-src/trunk/ext/xsl/xsltprocessor.c Modified: php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c === --- php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c2011-08-08 16:45:45 UTC (rev 314563) +++ php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c2011-08-08 16:49:43 UTC (rev 314564) @@ -280,7 +280,7 @@ node->parent = nsparent; node->ns = curns; } - child = php_dom_create_object(node, &ret, NULL, child, domintern TSRMLS_CC); + child = php_dom_create_object(node, &ret, child, domintern TSRMLS_CC); add_next_index_zval(args[i], child); } } Modified: php/php-src/trunk/ext/xsl/xsltprocessor.c === --- php/php-src/trunk/ext/xsl/xsltprocessor.c 2011-08-08 16:45:45 UTC (rev 314563) +++ php/php-src/trunk/ext/xsl/xsltprocessor.c 2011-08-08 16:49:43 UTC (rev 314564) @@ -280,7 +280,7 @@ node->parent = nsparent; node->ns = curns; } - child = php_dom_create_object(node, &ret, NULL, child, domintern TSRMLS_CC); + child = php_dom_create_object(node, &ret, child, domintern TSRMLS_CC); add_next_index_zval(args[i], child); } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/xsl/xsltprocessor.c trunk/ext/xsl/xsltprocessor.c
iliaaMon, 08 Aug 2011 16:06:40 + Revision: http://svn.php.net/viewvc?view=revision&revision=314541 Log: Fixed build Changed paths: U php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c U php/php-src/trunk/ext/xsl/xsltprocessor.c Modified: php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c === --- php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c2011-08-08 15:55:18 UTC (rev 314540) +++ php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c2011-08-08 16:06:40 UTC (rev 314541) @@ -620,7 +620,7 @@ */ PHP_FUNCTION(xsl_xsltprocessor_transform_to_doc) { - zval *id, *rv = NULL, *docp = NULL; + zval *id, *docp = NULL; xmlDoc *newdocp; xsltStylesheetPtr sheetp; int ret, ret_class_len=0; @@ -664,7 +664,7 @@ php_libxml_increment_doc_ref(interndoc, newdocp TSRMLS_CC); php_libxml_increment_node_ptr(interndoc, (xmlNodePtr)newdocp, (void *)interndoc TSRMLS_CC); } else { - DOM_RET_OBJ(rv, (xmlNodePtr) newdocp, &ret, NULL); + DOM_RET_OBJ((xmlNodePtr) newdocp, &ret, NULL); } } else { RETURN_FALSE; Modified: php/php-src/trunk/ext/xsl/xsltprocessor.c === --- php/php-src/trunk/ext/xsl/xsltprocessor.c 2011-08-08 15:55:18 UTC (rev 314540) +++ php/php-src/trunk/ext/xsl/xsltprocessor.c 2011-08-08 16:06:40 UTC (rev 314541) @@ -620,7 +620,7 @@ */ PHP_FUNCTION(xsl_xsltprocessor_transform_to_doc) { - zval *id, *rv = NULL, *docp = NULL; + zval *id, *docp = NULL; xmlDoc *newdocp; xsltStylesheetPtr sheetp; int ret, ret_class_len=0; @@ -664,7 +664,7 @@ php_libxml_increment_doc_ref(interndoc, newdocp TSRMLS_CC); php_libxml_increment_node_ptr(interndoc, (xmlNodePtr)newdocp, (void *)interndoc TSRMLS_CC); } else { - DOM_RET_OBJ(rv, (xmlNodePtr) newdocp, &ret, NULL); + DOM_RET_OBJ((xmlNodePtr) newdocp, &ret, NULL); } } else { RETURN_FALSE; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/xsl/xsltprocessor.c trunk/ext/xsl/xsltprocessor.c
pajoye Thu, 14 Jul 2011 11:12:33 + Revision: http://svn.php.net/viewvc?view=revision&revision=313235 Log: - fix build Changed paths: U php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c U php/php-src/trunk/ext/xsl/xsltprocessor.c Modified: php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c === --- php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c2011-07-14 11:07:17 UTC (rev 313234) +++ php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c2011-07-14 11:12:33 UTC (rev 313235) @@ -916,8 +916,9 @@ { zval *id; xsl_object *intern; + long securityPrefs, oldSecurityPrefs; + DOM_GET_THIS(id); - long securityPrefs, oldSecurityPrefs; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &securityPrefs) == FAILURE) { return; } @@ -933,9 +934,9 @@ { zval *id; xsl_object *intern; - DOM_GET_THIS(id); long securityPrefs; + DOM_GET_THIS(id); if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "") == SUCCESS) { intern = (xsl_object *)zend_object_store_get_object(id TSRMLS_CC); RETURN_LONG(intern->securityPrefs); Modified: php/php-src/trunk/ext/xsl/xsltprocessor.c === --- php/php-src/trunk/ext/xsl/xsltprocessor.c 2011-07-14 11:07:17 UTC (rev 313234) +++ php/php-src/trunk/ext/xsl/xsltprocessor.c 2011-07-14 11:12:33 UTC (rev 313235) @@ -916,8 +916,9 @@ { zval *id; xsl_object *intern; + long securityPrefs, oldSecurityPrefs; + DOM_GET_THIS(id); - long securityPrefs, oldSecurityPrefs; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &securityPrefs) == FAILURE) { return; } @@ -933,9 +934,9 @@ { zval *id; xsl_object *intern; - DOM_GET_THIS(id); long securityPrefs; + DOM_GET_THIS(id); if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "") == SUCCESS) { intern = (xsl_object *)zend_object_store_get_object(id TSRMLS_CC); RETURN_LONG(intern->securityPrefs); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php