summaryrefslogtreecommitdiff
path: root/ext/dom/element.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/dom/element.c')
-rw-r--r--ext/dom/element.c76
1 files changed, 38 insertions, 38 deletions
diff --git a/ext/dom/element.c b/ext/dom/element.c
index 606a23f9cb..0aff19561a 100644
--- a/ext/dom/element.c
+++ b/ext/dom/element.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 |
@@ -159,8 +159,9 @@ PHP_METHOD(domelement, __construct)
dom_object *intern;
char *name, *value = NULL, *uri = NULL;
char *localname = NULL, *prefix = NULL;
- int errorcode = 0, uri_len = 0;
- int name_len, value_len = 0, name_valid;
+ int errorcode = 0;
+ size_t name_len, value_len = 0, uri_len = 0;
+ int name_valid;
xmlNsPtr nsptr = NULL;
zend_error_handling error_handling;
@@ -200,7 +201,7 @@ PHP_METHOD(domelement, __construct)
}
} else {
/* If you don't pass a namespace uri, then you can't set a prefix */
- localname = xmlSplitQName2((xmlChar *)name, (xmlChar **) &prefix);
+ localname = (char *) xmlSplitQName2((xmlChar *) name, (xmlChar **) &prefix);
if (prefix != NULL) {
xmlFree(localname);
xmlFree(prefix);
@@ -219,14 +220,12 @@ PHP_METHOD(domelement, __construct)
xmlNodeSetContentLen(nodep, (xmlChar *) value, value_len);
}
- intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
- if (intern != NULL) {
- oldnode = dom_object_get_node(intern);
- if (oldnode != NULL) {
- php_libxml_node_free_resource(oldnode TSRMLS_CC);
- }
- php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC);
+ intern = Z_DOMOBJ_P(id);
+ oldnode = dom_object_get_node(intern);
+ if (oldnode != NULL) {
+ php_libxml_node_free_resource(oldnode TSRMLS_CC);
}
+ php_libxml_increment_node_ptr((php_libxml_node_object *)intern, nodep, (void *)intern TSRMLS_CC);
}
/* }}} end DOMElement::__construct */
@@ -235,7 +234,7 @@ readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-104682815
Since:
*/
-int dom_element_tag_name_read(dom_object *obj, zval **retval TSRMLS_DC)
+int dom_element_tag_name_read(dom_object *obj, zval *retval TSRMLS_DC)
{
xmlNodePtr nodep;
xmlNsPtr ns;
@@ -248,16 +247,15 @@ int dom_element_tag_name_read(dom_object *obj, zval **retval TSRMLS_DC)
return FAILURE;
}
- ALLOC_ZVAL(*retval);
ns = nodep->ns;
if (ns != NULL && ns->prefix) {
qname = xmlStrdup(ns->prefix);
qname = xmlStrcat(qname, (xmlChar *)":");
qname = xmlStrcat(qname, nodep->name);
- ZVAL_STRING(*retval, (char *)qname, 1);
+ ZVAL_STRING(retval, (char *)qname);
xmlFree(qname);
} else {
- ZVAL_STRING(*retval, (char *) nodep->name, 1);
+ ZVAL_STRING(retval, (char *) nodep->name);
}
return SUCCESS;
@@ -270,10 +268,9 @@ readonly=yes
URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Element-schemaTypeInfo
Since: DOM Level 3
*/
-int dom_element_schema_type_info_read(dom_object *obj, zval **retval TSRMLS_DC)
+int dom_element_schema_type_info_read(dom_object *obj, zval *retval TSRMLS_DC)
{
- ALLOC_ZVAL(*retval);
- ZVAL_NULL(*retval);
+ ZVAL_NULL(retval);
return SUCCESS;
}
@@ -334,7 +331,7 @@ PHP_FUNCTION(dom_element_get_attribute)
xmlChar *value = NULL;
dom_object *intern;
xmlNodePtr attr;
- int name_len;
+ size_t name_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) {
return;
@@ -359,7 +356,7 @@ PHP_FUNCTION(dom_element_get_attribute)
if (value == NULL) {
RETURN_EMPTY_STRING();
} else {
- RETVAL_STRING((char *)value, 1);
+ RETVAL_STRING((char *)value);
xmlFree(value);
}
}
@@ -374,7 +371,8 @@ PHP_FUNCTION(dom_element_set_attribute)
zval *id;
xmlNode *nodep;
xmlNodePtr attr = NULL;
- int ret, name_len, value_len, name_valid;
+ int ret, name_valid;
+ size_t name_len, value_len;
dom_object *intern;
char *name, *value;
@@ -440,7 +438,7 @@ PHP_FUNCTION(dom_element_remove_attribute)
zval *id;
xmlNodePtr nodep, attrp;
dom_object *intern;
- int name_len;
+ size_t name_len;
char *name;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) {
@@ -487,7 +485,8 @@ PHP_FUNCTION(dom_element_get_attribute_node)
{
zval *id;
xmlNodePtr nodep, attrp;
- int name_len, ret;
+ size_t name_len;
+ int ret;
dom_object *intern;
char *name;
@@ -636,7 +635,7 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name)
{
zval *id;
xmlNodePtr elemp;
- int name_len;
+ size_t name_len;
dom_object *intern, *namednode;
char *name;
xmlChar *local;
@@ -648,7 +647,7 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name)
DOM_GET_OBJ(elemp, id, xmlNodePtr, intern);
php_dom_create_interator(return_value, DOM_NODELIST TSRMLS_CC);
- namednode = (dom_object *)zend_objects_get_address(return_value TSRMLS_CC);
+ namednode = Z_DOMOBJ_P(return_value);
local = xmlCharStrndup(name, name_len);
dom_namednode_iter(intern, 0, namednode, NULL, local, NULL TSRMLS_CC);
}
@@ -664,7 +663,7 @@ PHP_FUNCTION(dom_element_get_attribute_ns)
xmlNodePtr elemp;
xmlNsPtr nsptr;
dom_object *intern;
- int uri_len = 0, name_len = 0;
+ size_t uri_len = 0, name_len = 0;
char *uri, *name;
xmlChar *strattr;
@@ -677,13 +676,13 @@ PHP_FUNCTION(dom_element_get_attribute_ns)
strattr = xmlGetNsProp(elemp, (xmlChar *) name, (xmlChar *) uri);
if (strattr != NULL) {
- RETVAL_STRING((char *)strattr, 1);
+ RETVAL_STRING((char *)strattr);
xmlFree(strattr);
} else {
if (xmlStrEqual((xmlChar *) uri, (xmlChar *)DOM_XMLNS_NAMESPACE)) {
nsptr = dom_get_nsdecl(elemp, (xmlChar *)name);
if (nsptr != NULL) {
- RETVAL_STRING((char *) nsptr->href, 1);
+ RETVAL_STRING((char *) nsptr->href);
} else {
RETVAL_EMPTY_STRING();
}
@@ -744,7 +743,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
xmlNodePtr elemp, nodep = NULL;
xmlNsPtr nsptr;
xmlAttr *attr;
- int uri_len = 0, name_len = 0, value_len = 0;
+ size_t uri_len = 0, name_len = 0, value_len = 0;
char *uri, *name, *value;
char *localname = NULL, *prefix = NULL;
dom_object *intern;
@@ -873,7 +872,7 @@ PHP_FUNCTION(dom_element_remove_attribute_ns)
xmlAttr *attrp;
xmlNsPtr nsptr;
dom_object *intern;
- int name_len, uri_len;
+ size_t name_len, uri_len;
char *name, *uri;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) {
@@ -929,7 +928,8 @@ PHP_FUNCTION(dom_element_get_attribute_node_ns)
xmlNodePtr elemp;
xmlAttrPtr attrp;
dom_object *intern;
- int uri_len, name_len, ret;
+ size_t uri_len, name_len;
+ int ret;
char *uri, *name;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os!s", &id, dom_element_class_entry, &uri, &uri_len, &name, &name_len) == FAILURE) {
@@ -1030,7 +1030,7 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name_ns)
{
zval *id;
xmlNodePtr elemp;
- int uri_len, name_len;
+ size_t uri_len, name_len;
dom_object *intern, *namednode;
char *uri, *name;
xmlChar *local, *nsuri;
@@ -1042,7 +1042,7 @@ PHP_FUNCTION(dom_element_get_elements_by_tag_name_ns)
DOM_GET_OBJ(elemp, id, xmlNodePtr, intern);
php_dom_create_interator(return_value, DOM_NODELIST TSRMLS_CC);
- namednode = (dom_object *)zend_objects_get_address(return_value TSRMLS_CC);
+ namednode = Z_DOMOBJ_P(return_value);
local = xmlCharStrndup(name, name_len);
nsuri = xmlCharStrndup(uri, uri_len);
dom_namednode_iter(intern, 0, namednode, NULL, local, nsuri TSRMLS_CC);
@@ -1060,7 +1060,7 @@ PHP_FUNCTION(dom_element_has_attribute)
xmlNode *nodep;
dom_object *intern;
char *name;
- int name_len;
+ size_t name_len;
xmlNodePtr attr;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &id, dom_element_class_entry, &name, &name_len) == FAILURE) {
@@ -1088,7 +1088,7 @@ PHP_FUNCTION(dom_element_has_attribute_ns)
xmlNodePtr elemp;
xmlNs *nsp;
dom_object *intern;
- int uri_len, name_len;
+ size_t uri_len, name_len;
char *uri, *name;
xmlChar *value;
@@ -1146,7 +1146,7 @@ PHP_FUNCTION(dom_element_set_id_attribute)
xmlAttrPtr attrp;
dom_object *intern;
char *name;
- int name_len;
+ size_t name_len;
zend_bool is_id;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Osb", &id, dom_element_class_entry, &name, &name_len, &is_id) == FAILURE) {
@@ -1181,7 +1181,7 @@ PHP_FUNCTION(dom_element_set_id_attribute_ns)
xmlNodePtr elemp;
xmlAttrPtr attrp;
dom_object *intern;
- int uri_len, name_len;
+ size_t uri_len, name_len;
char *uri, *name;
zend_bool is_id;
View Lorry Controller Status