diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
| commit | 4a2e40bb861bc3cf5fb6863e57486ed60316e97c (patch) | |
| tree | 6579660b282fdd1bc50095e48d702913a0b6aa97 /ext/dom/document.c | |
| parent | 8cce5b2641fb91c3073018b59f6f044b843041a8 (diff) | |
| download | php-git-4a2e40bb861bc3cf5fb6863e57486ed60316e97c.tar.gz | |
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
Diffstat (limited to 'ext/dom/document.c')
| -rw-r--r-- | ext/dom/document.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/dom/document.c b/ext/dom/document.c index 9e18d7fcba..0ab0e498c8 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -347,7 +347,7 @@ int dom_document_encoding_write(dom_object *obj, zval *newval) if (docp->encoding != NULL) { xmlFree((xmlChar *)docp->encoding); } - docp->encoding = xmlStrdup((const xmlChar *) str->val); + docp->encoding = xmlStrdup((const xmlChar *) ZSTR_VAL(str)); } else { php_error_docref(NULL, E_WARNING, "Invalid Document Encoding"); } @@ -438,7 +438,7 @@ int dom_document_version_write(dom_object *obj, zval *newval) str = zval_get_string(newval); - docp->version = xmlStrdup((const xmlChar *) str->val); + docp->version = xmlStrdup((const xmlChar *) ZSTR_VAL(str)); zend_string_release(str); return SUCCESS; @@ -666,7 +666,7 @@ int dom_document_document_uri_write(dom_object *obj, zval *newval) str = zval_get_string(newval); - docp->URL = xmlStrdup((const xmlChar *) str->val); + docp->URL = xmlStrdup((const xmlChar *) ZSTR_VAL(str)); zend_string_release(str); return SUCCESS; @@ -2223,11 +2223,11 @@ PHP_METHOD(domdocument, registerNodeClass) DOM_GET_OBJ(docp, id, xmlDocPtr, intern); if (dom_set_doc_classmap(intern->document, basece, ce) == FAILURE) { - php_error_docref(NULL, E_ERROR, "Class %s could not be registered.", ce->name->val); + php_error_docref(NULL, E_ERROR, "Class %s could not be registered.", ZSTR_VAL(ce->name)); } RETURN_TRUE; } else { - php_error_docref(NULL, E_ERROR, "Class %s is not derived from %s.", ce->name->val, basece->name->val); + php_error_docref(NULL, E_ERROR, "Class %s is not derived from %s.", ZSTR_VAL(ce->name), ZSTR_VAL(basece->name)); } RETURN_FALSE; |