diff options
| author | Stanley Sufficool <ssufficool@php.net> | 2014-10-20 21:33:32 -0700 |
|---|---|---|
| committer | Stanley Sufficool <ssufficool@php.net> | 2014-10-20 21:33:32 -0700 |
| commit | 8defcb855ab01d9c8ab4759cb793d80149b55a8c (patch) | |
| tree | ed51eb30a2cbc92b102557498fb3e4113da1bb07 /ext/dom/text.c | |
| parent | 9c7dbb0487f5991fde03873ea8f5e66d6688415f (diff) | |
| parent | baddb1c73a170ef1d2c31bd54cddbc6e1ab596b9 (diff) | |
| download | php-git-8defcb855ab01d9c8ab4759cb793d80149b55a8c.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (6215 commits)
Extra comma
Moved proxy object support in ASSIGN_ADD (and family) from VM to slow paths of corresponding operators
Simplification
zend_get_property_info_quick() cleanup and optimization
initialize lineno before calling compile file file in phar
Use ADDREF instead of DUP, it must be enough.
Removed old irrelevant comment
fixed compilation error
Fix bug #68262: Broken reference across cloned objects
export functions needed for phpdbg
Fixed compilation
Optimized property access handlers. Removed EG(std_property_info).
Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
Don't make difference between undefined and unaccessible properies when call __get() and family
Don't make useless CSE
array_pop/array_shift optimization
check for zlib headers as well as lib for mysqlnd
a realpath cache key can be int or float, catching this
News entry for new curl constants
News entry for new curl constants
...
Diffstat (limited to 'ext/dom/text.c')
| -rw-r--r-- | ext/dom/text.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/ext/dom/text.c b/ext/dom/text.c index f608997050..1cefa665aa 100644 --- a/ext/dom/text.c +++ b/ext/dom/text.c @@ -1,8 +1,8 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -69,7 +69,7 @@ PHP_METHOD(domtext, __construct) xmlNodePtr nodep = NULL, oldnode = NULL; dom_object *intern; char *value = NULL; - int value_len; + size_t value_len; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); @@ -86,7 +86,7 @@ PHP_METHOD(domtext, __construct) RETURN_FALSE; } - intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC); + intern = Z_DOMOBJ_P(id); if (intern != NULL) { oldnode = dom_object_get_node(intern); if (oldnode != NULL) { @@ -102,7 +102,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-wholeText Since: DOM Level 3 */ -int dom_text_whole_text_read(dom_object *obj, zval **retval TSRMLS_DC) +int dom_text_whole_text_read(dom_object *obj, zval *retval TSRMLS_DC) { xmlNodePtr node; xmlChar *wholetext = NULL; @@ -125,12 +125,11 @@ int dom_text_whole_text_read(dom_object *obj, zval **retval TSRMLS_DC) node = node->next; } - ALLOC_ZVAL(*retval); if (wholetext != NULL) { - ZVAL_STRING(*retval, wholetext, 1); + ZVAL_STRING(retval, (char *) wholetext); xmlFree(wholetext); } else { - ZVAL_EMPTY_STRING(*retval); + ZVAL_EMPTY_STRING(retval); } return SUCCESS; @@ -150,8 +149,7 @@ PHP_FUNCTION(dom_text_split_text) xmlChar *second; xmlNodePtr node; xmlNodePtr nnode; - long offset; - int ret; + zend_long offset; int length; dom_object *intern; @@ -196,7 +194,7 @@ PHP_FUNCTION(dom_text_split_text) nnode->type = XML_TEXT_NODE; } - return_value = php_dom_create_object(nnode, &ret, return_value, intern TSRMLS_CC); + php_dom_create_object(nnode, return_value, intern TSRMLS_CC); } /* }}} end dom_text_split_text */ |