Index: valid.c
===================================================================
RCS file: /cvs/gnome/gnome-xml/valid.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -c -r1.131 -r1.132
*** valid.c	8 Oct 2002 08:26:11 -0000	1.131
--- valid.c	9 Oct 2002 10:20:30 -0000	1.132
***************
*** 4552,4560 ****
         xmlElementPtr elemDecl, int warn, xmlNodePtr parent) {
      int ret = 1;
  #ifndef  LIBXML_REGEXP_ENABLED
!     xmlNodePtr last = NULL;
  #endif
!     xmlNodePtr repl = NULL, cur, tmp;
      xmlElementContentPtr cont;
      const xmlChar *name;
  
--- 4552,4560 ----
         xmlElementPtr elemDecl, int warn, xmlNodePtr parent) {
      int ret = 1;
  #ifndef  LIBXML_REGEXP_ENABLED
!     xmlNodePtr repl = NULL, last = NULL, tmp;
  #endif
!     xmlNodePtr cur;
      xmlElementContentPtr cont;
      const xmlChar *name;
  
***************
*** 4572,4577 ****
--- 4572,4580 ----
      } else {
  	xmlRegExecCtxtPtr exec;
  
+ 	ctxt->nodeMax = 0;
+ 	ctxt->nodeNr = 0;
+ 	ctxt->nodeTab = NULL;
  	exec = xmlRegNewExecCtxt(elemDecl->contModel, NULL, NULL);
  	if (exec != NULL) {
  	    cur = child;
***************
*** 4763,4771 ****
--- 4766,4776 ----
  	    expr[0] = 0;
  	    xmlSnprintfElementContent(expr, 5000, cont, 1);
  	    list[0] = 0;
+ #ifndef LIBXML_REGEXP_ENABLED
  	    if (repl != NULL)
  		xmlSnprintfElements(list, 5000, repl, 1);
  	    else
+ #endif /* LIBXML_REGEXP_ENABLED */
  		xmlSnprintfElements(list, 5000, child, 1);
  
  	    if (name != NULL) {
***************
*** 4798,4804 ****
  
  #ifndef  LIBXML_REGEXP_ENABLED
  done:
- #endif
      /*
       * Deallocate the copy if done, and free up the validation stack
       */
--- 4803,4808 ----
***************
*** 4812,4817 ****
--- 4816,4822 ----
  	xmlFree(ctxt->vstateTab);
  	ctxt->vstateTab = NULL;
      }
+ #endif
      ctxt->nodeMax = 0;
      ctxt->nodeNr = 0;
      if (ctxt->nodeTab != NULL) {