/[ascend]/trunk/base/generic/utilities/error.c
ViewVC logotype

Diff of /trunk/base/generic/utilities/error.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 961 by johnpye, Fri Nov 24 03:58:49 2006 UTC revision 962 by johnpye, Mon Dec 11 14:43:02 2006 UTC
# Line 115  int error_reporter_tree_start(){ Line 115  int error_reporter_tree_start(){
115      error_reporter_tree_t *tnew;      error_reporter_tree_t *tnew;
116      tnew = error_reporter_tree_new();      tnew = error_reporter_tree_new();
117    
118      CONSOLE_DEBUG("TREE = %p",TREE);      /* CONSOLE_DEBUG("TREE = %p",TREE); */
119      CONSOLE_DEBUG("TREECURRENT = %p",TREECURRENT);      /* CONSOLE_DEBUG("TREECURRENT = %p",TREECURRENT); */
120    
121  #if 0  #if 0
122      if(TREE != NULL && TREECURRENT == NULL){      if(TREE != NULL && TREECURRENT == NULL){
# Line 128  int error_reporter_tree_start(){ Line 128  int error_reporter_tree_start(){
128  #endif  #endif
129    
130      if(TREE == NULL){      if(TREE == NULL){
131          CONSOLE_DEBUG("CREATING ROOT");          /* CONSOLE_DEBUG("CREATING ROOT"); */
132          /* we're creating the root */          /* we're creating the root */
133          tnew->parent = NULL;          tnew->parent = NULL;
134          TREE = tnew;          TREE = tnew;
135          TREECURRENT = tnew;          TREECURRENT = tnew;
136          CONSOLE_DEBUG("TREECURRENT = %p",TREECURRENT);          /* CONSOLE_DEBUG("TREECURRENT = %p",TREECURRENT); */
137      }else{      }else{
138          asc_assert(TREECURRENT != NULL);          asc_assert(TREECURRENT != NULL);
139          CONSOLE_DEBUG("CREATING SUBTREE");          /* CONSOLE_DEBUG("CREATING SUBTREE"); */
140          if(TREECURRENT->head == NULL){          if(TREECURRENT->head == NULL){
141              /* if the current tree has no elements, add it as the head */              /* if the current tree has no elements, add it as the head */
142              TREECURRENT->head = tnew;              TREECURRENT->head = tnew;
# Line 149  int error_reporter_tree_start(){ Line 149  int error_reporter_tree_start(){
149    
150          /* now switch the context to the sub-tree */          /* now switch the context to the sub-tree */
151          tnew->parent = TREECURRENT;          tnew->parent = TREECURRENT;
152          CONSOLE_DEBUG("SET TREECURRENT TO %p",TREECURRENT);          /* CONSOLE_DEBUG("SET TREECURRENT TO %p",TREECURRENT); */
153          TREECURRENT = tnew;          TREECURRENT = tnew;
154      }      }
155      return 0;      return 0;
# Line 162  int error_reporter_tree_end(){ Line 162  int error_reporter_tree_end(){
162          return 1;          return 1;
163      }      }
164      TREECURRENT = TREECURRENT->parent;      TREECURRENT = TREECURRENT->parent;
165      CONSOLE_DEBUG("SET TREECURRENT TO %p",TREECURRENT);      /* CONSOLE_DEBUG("SET TREECURRENT TO %p",TREECURRENT); */
166      return 0;      return 0;
167  }    }  
168    
# Line 305  va_error_reporter( Line 305  va_error_reporter(
305              return res;              return res;
306          }else if(TREE){          }else if(TREE){
307              /* flush the tree before outputting current message */              /* flush the tree before outputting current message */
308              CONSOLE_DEBUG("WRITING OUT TREE CONTENTS");              /* CONSOLE_DEBUG("WRITING OUT TREE CONTENTS"); */
309              t = TREE;              t = TREE;
310              TREE = NULL;              TREE = NULL;
311              error_reporter_tree_write(t);              error_reporter_tree_write(t);
312              CONSOLE_DEBUG("DONE WRITING TREE");              CONSOLE_DEBUG("DONE WRITING TREE");
313              TREECURRENT = t;              TREECURRENT = t;
314              error_reporter_tree_clear();              error_reporter_tree_clear();
315              CONSOLE_DEBUG("DONE FREEING TREE");              /* CONSOLE_DEBUG("DONE FREEING TREE");
316              CONSOLE_DEBUG("TREE = %p",TREE);              CONSOLE_DEBUG("TREE = %p",TREE);
317              CONSOLE_DEBUG("TREECURRENT = %p",TREECURRENT);              CONSOLE_DEBUG("TREECURRENT = %p",TREECURRENT); */
318          }          }
319      }      }
320  #endif  #endif
Legend:
Removed from v.961  
changed lines
  Added in v.962
john.pye@anu.edu.au
 ViewVC Help
Powered by ViewVC 1.1.22