RE: [PHP-CVS] cvs: php4 /ext/domxml php_domxml.c

Thanks. I did realize the mistake. Just didn't fix it fast enough. > -----Original Message----- > From: James Cox [mailto:imajes@php.net] > Sent: Wednesday, August 07, 2002 12:59 PM > To: Joseph Tate; php-cvs@lists.php.net > Subject: RE: [PHP-CVS] cvs: php4 /ext/domxml php_domxml.c > > > > jtate Wed Aug 7 12:52:01 2002 EDT > > > > Modified files: > > /php4/ext/domxml php_domxml.c > > Log: > > #Don't use C++ Comments bug #18783 > > > > > > Would you like to fix this now to sort out your cvs merge errors? > > -- james > > > Index: php4/ext/domxml/php_domxml.c > > diff -u php4/ext/domxml/php_domxml.c:1.182 > > php4/ext/domxml/php_domxml.c:1.183 > > --- php4/ext/domxml/php_domxml.c:1.182 Mon Jul 29 10:04:44 2002 > > +++ php4/ext/domxml/php_domxml.c Wed Aug 7 12:52:00 2002 > > @@ -16,7 +16,7 @@ > > > > +----------------------------------------------------------------------+ > > */ > > > > -/* $Id: php_domxml.c,v 1.182 2002/07/29 14:04:44 chregu Exp $ */ > > +/* $Id: php_domxml.c,v 1.183 2002/08/07 16:52:00 jtate Exp $ */ > > > > /* TODO > > * - Support Notation Nodes > > @@ -634,6 +634,11 @@ > > 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 @@ > > node_wrapper_dtor(node); > > } > > > > +>>>>>>> 1.181 > > } > > > > > > @@ -1378,7 +1384,7 @@ > > 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 @@ > > 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 @@ > > > > 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); > > > > > > > > -- > > PHP CVS Mailing List (http://www.php.net/) > > To unsubscribe, visit: http://www.php.net/unsub.php > > > >