diff options
| author | Joseph Tate <jtate@php.net> | 2002-08-07 16:52:00 +0000 |
|---|---|---|
| committer | Joseph Tate <jtate@php.net> | 2002-08-07 16:52:00 +0000 |
| commit | 17d94ed8211deec813dab428011a9709671a3d72 (patch) | |
| tree | b80312c0a077b504ee9f1dbbb721a5ab0389988f /ext/domxml/php_domxml.c | |
| parent | abb280e9f795087fdfc08f8112ea200d1ed564be (diff) | |
| download | php-git-17d94ed8211deec813dab428011a9709671a3d72.tar.gz | |
#Don't use C++ Comments bug #18783
Diffstat (limited to 'ext/domxml/php_domxml.c')
| -rw-r--r-- | ext/domxml/php_domxml.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c index d18a996ca3..146b915b42 100644 --- a/ext/domxml/php_domxml.c +++ b/ext/domxml/php_domxml.c @@ -634,6 +634,11 @@ static void php_free_xml_doc(zend_rsrc_list_entry *rsrc TSRMLS_DC) static void php_free_xml_node(zend_rsrc_list_entry *rsrc TSRMLS_DC) { xmlNodePtr node = (xmlNodePtr) rsrc->ptr; +<<<<<<< php_domxml.c + + node_wrapper_dtor(node); + dom_object_set_data(node, NULL); +======= /* if node has no parent, it will not be freed by php_free_xml_doc, so do it here and for all children as well. */ @@ -646,6 +651,7 @@ static void php_free_xml_node(zend_rsrc_list_entry *rsrc TSRMLS_DC) node_wrapper_dtor(node); } +>>>>>>> 1.181 } @@ -1378,7 +1384,7 @@ static void domxml_error_ext(void *ctx, const char *msg, ...) MAKE_STD_ZVAL(errormessages); if(array_init(errormessages) != SUCCESS) { - // do error handling here + /* do error handling here */ } add_assoc_string(errormessages,"errormessage",buf,1); input = ctxt->input; @@ -1415,7 +1421,7 @@ static void domxml_error_validate(void *ctx, const char *msg, ...) zval *errormessages; MAKE_STD_ZVAL(errormessages); if(array_init(errormessages) != SUCCESS) { - // do error handling here + /* do error handling here */ } if (ctxt->parser != NULL) { if (ctxt->parser->name) { @@ -1434,9 +1440,9 @@ static void domxml_error_validate(void *ctx, const char *msg, ...) if (ctxt->valid->node != NULL) { -// php_error(E_WARNING,"nodename %s",(char *) ctxt->valid->name); - -// node = *ctxt->node; + /*php_error(E_WARNING,"nodename %s",(char *) ctxt->valid->name); + + node = *ctxt->node;*/ } add_assoc_string(errormessages,"errormessage",buf,1); add_next_index_zval(ctxt->errors,errormessages); |