diff options
Diffstat (limited to 'ext/dom/php_dom.h')
-rw-r--r-- | ext/dom/php_dom.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h index 02eb2d9509..bb4aa160e6 100644 --- a/ext/dom/php_dom.h +++ b/ext/dom/php_dom.h @@ -99,45 +99,45 @@ typedef struct { dom_object *dom_object_get_data(xmlNodePtr obj); dom_doc_propsptr dom_get_doc_props(php_libxml_ref_obj *document); -zend_object *dom_objects_new(zend_class_entry *class_type TSRMLS_DC); -zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type TSRMLS_DC); +zend_object *dom_objects_new(zend_class_entry *class_type); +zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type); #if defined(LIBXML_XPATH_ENABLED) -zend_object *dom_xpath_objects_new(zend_class_entry *class_type TSRMLS_DC); +zend_object *dom_xpath_objects_new(zend_class_entry *class_type); #endif int dom_get_strict_error(php_libxml_ref_obj *document); -void php_dom_throw_error(int error_code, int strict_error TSRMLS_DC); -void php_dom_throw_error_with_message(int error_code, char *error_message, int strict_error TSRMLS_DC); -void node_list_unlink(xmlNodePtr node TSRMLS_DC); +void php_dom_throw_error(int error_code, int strict_error); +void php_dom_throw_error_with_message(int error_code, char *error_message, int strict_error); +void node_list_unlink(xmlNodePtr node); int dom_check_qname(char *qname, char **localname, char **prefix, int uri_len, int name_len); xmlNsPtr dom_get_ns(xmlNodePtr node, char *uri, int *errorcode, char *prefix); void dom_set_old_ns(xmlDoc *doc, xmlNs *ns); xmlNsPtr dom_get_nsdecl(xmlNode *node, xmlChar *localName); -void dom_normalize (xmlNodePtr nodep TSRMLS_DC); +void dom_normalize (xmlNodePtr nodep); xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr nodep, char *ns, char *local, int *cur, int index); -void php_dom_create_implementation(zval *retval TSRMLS_DC); +void php_dom_create_implementation(zval *retval); int dom_hierarchy(xmlNodePtr parent, xmlNodePtr child); int dom_has_feature(char *feature, char *version); int dom_node_is_read_only(xmlNodePtr node); int dom_node_children_valid(xmlNodePtr node); -void php_dom_create_interator(zval *return_value, int ce_type TSRMLS_DC); -void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xmlHashTablePtr ht, xmlChar *local, xmlChar *ns TSRMLS_DC); +void php_dom_create_interator(zval *return_value, int ce_type); +void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xmlHashTablePtr ht, xmlChar *local, xmlChar *ns); xmlNodePtr create_notation(const xmlChar *name, const xmlChar *ExternalID, const xmlChar *SystemID); xmlNode *php_dom_libxml_hash_iter(xmlHashTable *ht, int index); xmlNode *php_dom_libxml_notation_iter(xmlHashTable *ht, int index); -zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC); -int dom_set_doc_classmap(php_libxml_ref_obj *document, zend_class_entry *basece, zend_class_entry *ce TSRMLS_DC); -zval *dom_nodelist_read_dimension(zval *object, zval *offset, int type, zval *rv TSRMLS_DC); -int dom_nodelist_has_dimension(zval *object, zval *member, int check_empty TSRMLS_DC); +zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, int by_ref); +int dom_set_doc_classmap(php_libxml_ref_obj *document, zend_class_entry *basece, zend_class_entry *ce); +zval *dom_nodelist_read_dimension(zval *object, zval *offset, int type, zval *rv); +int dom_nodelist_has_dimension(zval *object, zval *member, int check_empty); #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 TSRMLS_CC); +entry = zend_register_internal_class_ex(&ce, parent_ce); #define DOM_GET_OBJ(__ptr, __id, __prtype, __intern) { \ __intern = Z_DOMOBJ_P(__id); \ if (__intern->ptr == NULL || !(__ptr = (__prtype)((php_libxml_node_ptr *)__intern->ptr)->node)) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name->val);\ + php_error_docref(NULL, E_WARNING, "Couldn't fetch %s", __intern->std.ce->name->val);\ RETURN_NULL();\ } \ } @@ -148,7 +148,7 @@ entry = zend_register_internal_class_ex(&ce, parent_ce TSRMLS_CC); } #define DOM_NOT_IMPLEMENTED() \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not yet implemented"); \ + php_error_docref(NULL, E_WARNING, "Not yet implemented"); \ return; #define DOM_NODELIST 0 |