summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/date/php_date.c11
-rw-r--r--ext/dom/attr.c13
-rw-r--r--ext/dom/document.c17
-rw-r--r--ext/dom/php_dom.c58
4 files changed, 20 insertions, 79 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 8009897b9a..a336321c61 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -4045,16 +4045,7 @@ void date_interval_write_property(zval *object, zval *member, zval *value, const
#define SET_VALUE_FROM_STRUCT(n,m) \
if (strcmp(Z_STRVAL_P(member), m) == 0) { \
- if (Z_TYPE_P(value) != IS_LONG) { \
- tmp_value = *value; \
- zval_copy_ctor(&tmp_value); \
- convert_to_long(&tmp_value); \
- value = &tmp_value; \
- } \
- obj->diff->n = Z_LVAL_P(value); \
- if (value == &tmp_value) { \
- zval_dtor(value); \
- } \
+ obj->diff->n = zval_get_long(value TSRMLS_CC); \
break; \
}
diff --git a/ext/dom/attr.c b/ext/dom/attr.c
index c5fdcfeeae..e436f180d7 100644
--- a/ext/dom/attr.c
+++ b/ext/dom/attr.c
@@ -161,7 +161,7 @@ int dom_attr_value_read(dom_object *obj, zval *retval TSRMLS_DC)
int dom_attr_value_write(dom_object *obj, zval *newval TSRMLS_DC)
{
- zval value_copy;
+ zend_string *str;
xmlAttrPtr attrp = (xmlAttrPtr) dom_object_get_node(obj);
if (attrp == NULL) {
@@ -173,18 +173,11 @@ int dom_attr_value_write(dom_object *obj, zval *newval TSRMLS_DC)
node_list_unlink(attrp->children TSRMLS_CC);
}
- if (Z_TYPE_P(newval) != IS_STRING) {
- ZVAL_DUP(&value_copy, newval);
- newval = &value_copy;
- convert_to_string(newval);
- }
+ str = zval_get_string(newval TSRMLS_CC);
xmlNodeSetContentLen((xmlNodePtr) attrp, Z_STRVAL_P(newval), Z_STRLEN_P(newval) + 1);
- if (newval == &value_copy) {
- zval_dtor(newval);
- }
-
+ STR_RELEASE(str);
return SUCCESS;
}
diff --git a/ext/dom/document.c b/ext/dom/document.c
index 4029d97db9..73ca6a95b3 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -330,7 +330,7 @@ int dom_document_encoding_read(dom_object *obj, zval **retval TSRMLS_DC)
int dom_document_encoding_write(dom_object *obj, zval *newval TSRMLS_DC)
{
xmlDoc *docp = (xmlDocPtr) dom_object_get_node(obj);
- zval value_copy;
+ zend_string *str;
xmlCharEncodingHandlerPtr handler;
if (docp == NULL) {
@@ -338,15 +338,7 @@ int dom_document_encoding_write(dom_object *obj, zval *newval TSRMLS_DC)
return FAILURE;
}
- // TODO: Stopped here
- if (newval->type != IS_STRING) {
- if(Z_REFCOUNT_P(newval) > 1) {
- value_copy = *newval;
- zval_copy_ctor(&value_copy);
- newval = &value_copy;
- }
- convert_to_string(newval);
- }
+ str = zval_get_string(newval TSMLRS_CC);
handler = xmlFindCharEncodingHandler(Z_STRVAL_P(newval));
@@ -360,10 +352,7 @@ int dom_document_encoding_write(dom_object *obj, zval *newval TSRMLS_DC)
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid Document Encoding");
}
- if (newval == &value_copy) {
- zval_dtor(newval);
- }
-
+ STR_RELEASE(str);
return SUCCESS;
}
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index d3aed667e3..ab5a7d7844 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -305,23 +305,15 @@ static void dom_register_prop_handler(HashTable *prop_handler, char *name, dom_r
static zval *dom_get_property_ptr_ptr(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) /* {{{ */
{
dom_object *obj = Z_DOMOBJ_P(object);
- zval tmp_member;
+ zend_string *member_str = zval_get_string(member TSRMLS_CC);
zval *retval = NULL;
- if (Z_TYPE_P(member) != IS_STRING) {
- ZVAL_DUP(&tmp_member, member);
- convert_to_string(&tmp_member);
- member = &tmp_member;
- }
-
- if (!obj->prop_handler || !zend_hash_exists(obj->prop_handler, Z_STR_P(member))) {
+ if (!obj->prop_handler || !zend_hash_exists(obj->prop_handler, member_str)) {
zend_object_handlers *std_hnd = zend_get_std_object_handlers();
retval = std_hnd->get_property_ptr_ptr(object, member, type, key TSRMLS_CC);
}
- if (member == &tmp_member) {
- zval_dtor(member);
- }
+ STR_RELEASE(member_str);
return retval;
}
/* }}} */
@@ -330,18 +322,12 @@ static zval *dom_get_property_ptr_ptr(zval *object, zval *member, int type, cons
zval *dom_read_property(zval *object, zval *member, int type, const zend_literal *key, zval *rv TSRMLS_DC)
{
dom_object *obj = Z_DOMOBJ_P(object);
- zval tmp_member;
+ zend_string *member_str = zval_get_string(member TSRMLS_CC);
zval *retval;
dom_prop_handler *hnd = NULL;
- if (Z_TYPE_P(member) != IS_STRING) {
- ZVAL_DUP(&tmp_member, member);
- convert_to_string(&tmp_member);
- member = &tmp_member;
- }
-
if (obj->prop_handler != NULL) {
- hnd = zend_hash_find_ptr(obj->prop_handler, Z_STR_P(member));
+ hnd = zend_hash_find_ptr(obj->prop_handler, member_str);
} else if (instanceof_function(obj->std.ce, dom_node_class_entry TSRMLS_CC)) {
php_error(E_WARNING, "Couldn't fetch %s. Node no longer exists", obj->std.ce->name->val);
}
@@ -358,9 +344,7 @@ zval *dom_read_property(zval *object, zval *member, int type, const zend_literal
retval = std_hnd->read_property(object, member, type, key, rv TSRMLS_CC);
}
- if (member == &tmp_member) {
- zval_dtor(member);
- }
+ STR_RELEASE(member_str);
return retval;
}
/* }}} */
@@ -369,17 +353,11 @@ zval *dom_read_property(zval *object, zval *member, int type, const zend_literal
void dom_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC)
{
dom_object *obj = Z_DOMOBJ_P(object);
- zval tmp_member;
+ zend_string *member_str = zval_get_string(member TSRMLS_CC);
dom_prop_handler *hnd = NULL;
- if (Z_TYPE_P(member) != IS_STRING) {
- ZVAL_DUP(&tmp_member, member);
- convert_to_string(&tmp_member);
- member = &tmp_member;
- }
-
if (obj->prop_handler != NULL) {
- hnd = zend_hash_find_ptr(obj->prop_handler, Z_STR_P(member));
+ hnd = zend_hash_find_ptr(obj->prop_handler, member_str);
}
if (hnd) {
hnd->write_func(obj, value TSRMLS_CC);
@@ -388,9 +366,7 @@ void dom_write_property(zval *object, zval *member, zval *value, const zend_lite
std_hnd->write_property(object, member, value, key TSRMLS_CC);
}
- if (member == &tmp_member) {
- zval_dtor(member);
- }
+ STR_RELEASE(member_str);
}
/* }}} */
@@ -398,18 +374,12 @@ void dom_write_property(zval *object, zval *member, zval *value, const zend_lite
static int dom_property_exists(zval *object, zval *member, int check_empty, const zend_literal *key TSRMLS_DC)
{
dom_object *obj = Z_DOMOBJ_P(object);
- zval tmp_member;
+ zend_string *member_str = zval_get_string(member TSRMLS_CC);
dom_prop_handler *hnd = NULL;
- int retval=0;
-
- if (Z_TYPE_P(member) != IS_STRING) {
- ZVAL_DUP(&tmp_member, member);
- convert_to_string(&tmp_member);
- member = &tmp_member;
- }
+ int retval = 0;
if (obj->prop_handler != NULL) {
- hnd = zend_hash_find_ptr(obj->prop_handler, Z_STR_P(member));
+ hnd = zend_hash_find_ptr(obj->prop_handler, member_str);
}
if (hnd) {
zval tmp;
@@ -429,9 +399,7 @@ static int dom_property_exists(zval *object, zval *member, int check_empty, cons
retval = std_hnd->has_property(object, member, check_empty, key TSRMLS_CC);
}
- if (member == &tmp_member) {
- zval_dtor(member);
- }
+ STR_RELEASE(member_str);
return retval;
}
/* }}} */
View Lorry Controller Status