diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-05-05 22:45:29 +0100 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-05-05 22:45:29 +0100 |
| commit | d7c529ed327cca4fad2c42fe74fabc367f24dc5b (patch) | |
| tree | 919d9e6800c6244436ddce9d09d707922fd859a4 /ext/dom/notation.c | |
| parent | 875c48ae679158cb2194c4e277810883e0b21768 (diff) | |
| parent | 211d32c81429730e2692c65577d021616a525726 (diff) | |
| download | php-git-d7c529ed327cca4fad2c42fe74fabc367f24dc5b.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
Diffstat (limited to 'ext/dom/notation.c')
| -rw-r--r-- | ext/dom/notation.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/ext/dom/notation.c b/ext/dom/notation.c index 4c0258cc1f..dc63f1516d 100644 --- a/ext/dom/notation.c +++ b/ext/dom/notation.c @@ -45,22 +45,19 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-54F2B4D0 Since: */ -int dom_notation_public_id_read(dom_object *obj, zval **retval TSRMLS_DC) +int dom_notation_public_id_read(dom_object *obj, zval *retval TSRMLS_DC) { - xmlEntityPtr nodep; - - nodep = (xmlEntityPtr) dom_object_get_node(obj); + xmlEntityPtr nodep = (xmlEntityPtr) dom_object_get_node(obj); if (nodep == NULL) { php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); return FAILURE; } - ALLOC_ZVAL(*retval); if (nodep->ExternalID) { - ZVAL_STRING(*retval, (char *) (nodep->ExternalID), 1); + ZVAL_STRING(retval, (char *) (nodep->ExternalID)); } else { - ZVAL_EMPTY_STRING(*retval); + ZVAL_EMPTY_STRING(retval); } return SUCCESS; @@ -73,22 +70,19 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-E8AAB1D0 Since: */ -int dom_notation_system_id_read(dom_object *obj, zval **retval TSRMLS_DC) +int dom_notation_system_id_read(dom_object *obj, zval *retval TSRMLS_DC) { - xmlEntityPtr nodep; - - nodep = (xmlEntityPtr) dom_object_get_node(obj); + xmlEntityPtr nodep = (xmlEntityPtr) dom_object_get_node(obj); if (nodep == NULL) { php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); return FAILURE; } - ALLOC_ZVAL(*retval); if (nodep->SystemID) { - ZVAL_STRING(*retval, (char *) (nodep->SystemID), 1); + ZVAL_STRING(retval, (char *) (nodep->SystemID)); } else { - ZVAL_EMPTY_STRING(*retval); + ZVAL_EMPTY_STRING(retval); } return SUCCESS; |