diff options
author | Rob Richards <rrichards@php.net> | 2003-06-20 14:08:56 +0000 |
---|---|---|
committer | Rob Richards <rrichards@php.net> | 2003-06-20 14:08:56 +0000 |
commit | c69d3959315806da31ea4cd209c71705f857889f (patch) | |
tree | c0dee89da3f7dc23c38dc626d3d4462a62de9406 /ext/dom/xml_common.h | |
parent | 015c6bacdd5ced1abe1fa0bdba2ee6f16e669e0e (diff) | |
download | php-git-c69d3959315806da31ea4cd209c71705f857889f.tar.gz |
cleanup common code
Diffstat (limited to 'ext/dom/xml_common.h')
-rw-r--r-- | ext/dom/xml_common.h | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h index b114106ec6..a2e6b2c5a0 100644 --- a/ext/dom/xml_common.h +++ b/ext/dom/xml_common.h @@ -52,36 +52,18 @@ typedef struct _dom_object { #endif /* DOM_EXPORTS */ #endif /* PHP_WIN32 */ -#ifdef ZTS -#include "TSRM.h" -#endif - #define PHP_DOM_EXPORT(__type) PHPAPI __type PHP_DOM_EXPORT(zval *) php_dom_create_object(xmlNodePtr obj, int *found, zval *in, zval* return_value, dom_object *domobj TSRMLS_DC); -PHP_DOM_EXPORT(void) dom_objects_clone(void *object, void **object_clone TSRMLS_DC); -void dom_objects_dtor(void *object, zend_object_handle handle TSRMLS_DC); PHP_DOM_EXPORT(zval *) dom_read_property(zval *object, zval *member TSRMLS_DC); PHP_DOM_EXPORT(void) dom_write_property(zval *object, zval *member, zval *value TSRMLS_DC); -zend_object_value dom_objects_new(zend_class_entry *class_type TSRMLS_DC); -void dom_unregister_node(xmlNodePtr nodep TSRMLS_DC); -zend_object_handlers dom_object_handlers; #define DOM_XMLNS_NAMESPACE \ (const xmlChar *) "http://www.w3.org/2000/xmlns/" -#define DOM_NOT_IMPLEMENTED() \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not yet implemented"); \ - return; - -#define REGISTER_DOM_CLASS(ce, name, parent_ce, funcs, entry) \ -INIT_CLASS_ENTRY(ce, name, funcs); \ -ce.create_object = dom_objects_new; \ -entry = zend_register_internal_class_ex(&ce, parent_ce, NULL TSRMLS_CC); - -#define DOM_GET_OBJ(__ptr, __id, __prtype, __intern) { \ - __intern = (dom_object *)zend_object_store_get_object(__id TSRMLS_CC); \ - if (!(__ptr = (__prtype)__intern->ptr)) { \ +#define NODE_GET_OBJ(__ptr, __id, __prtype, __intern) { \ + __intern = (node_object *)zend_object_store_get_object(__id TSRMLS_CC); \ + if (!(__ptr = (__prtype)__intern->node)) { \ php_error(E_WARNING, "Couldn't fetch %s", __intern->std.ce->name);\ RETURN_NULL();\ } \ @@ -97,15 +79,12 @@ entry = zend_register_internal_class_ex(&ce, parent_ce, NULL TSRMLS_CC); } \ } -#define DOM_DOMOBJ_NEW(zval, obj, ret, domobject) \ +#define DOM_RET_OBJ(zval, obj, ret, domobject) \ if (NULL == (zval = php_dom_create_object(obj, ret, zval, return_value, domobject TSRMLS_CC))) { \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); \ RETURN_FALSE; \ } -#define DOM_RET_OBJ(zval, obj, ret, domobject) \ - DOM_DOMOBJ_NEW(zval, obj, ret, domobject); - #define DOM_GET_THIS(zval) \ if (NULL == (zval = getThis())) { \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Underlying object missing"); \ |