diff options
Diffstat (limited to 'ext/dom/notation.c')
| -rw-r--r-- | ext/dom/notation.c | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/ext/dom/notation.c b/ext/dom/notation.c index 4b87f5c77d..109eeca9cf 100644 --- a/ext/dom/notation.c +++ b/ext/dom/notation.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2015 The PHP Group | +----------------------------------------------------------------------+ @@ -28,10 +28,10 @@ #include "php_dom.h" /* -* class DOMNotation extends DOMNode +* class DOMNotation extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5431D1B9 -* Since: +* Since: */ const zend_function_entry php_dom_notation_class_functions[] = { @@ -40,27 +40,24 @@ const zend_function_entry php_dom_notation_class_functions[] = { /* {{{ attribute protos, not implemented yet */ -/* {{{ publicId string -readonly=yes +/* {{{ publicId string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-54F2B4D0 -Since: +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) { - 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); + php_dom_throw_error(INVALID_STATE_ERR, 0); 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; @@ -68,27 +65,24 @@ int dom_notation_public_id_read(dom_object *obj, zval **retval TSRMLS_DC) /* }}} */ -/* {{{ systemId string -readonly=yes +/* {{{ systemId string +readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-E8AAB1D0 -Since: +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) { - 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); + php_dom_throw_error(INVALID_STATE_ERR, 0); 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; |