cvs commit: ALFS/nALFS/src backend.c nalfs.c

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Mar 27 13:37:58 PST 2004


kpfleming    04/03/27 14:37:58

  Modified:    nALFS/src backend.c nalfs.c
  Log:
  correct element marking and run status computation
  
  Revision  Changes    Path
  1.19      +2 -3      ALFS/nALFS/src/backend.c
  
  Index: backend.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/backend.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- backend.c	27 Mar 2004 19:51:56 -0000	1.18
  +++ backend.c	27 Mar 2004 21:37:57 -0000	1.19
  @@ -356,7 +356,7 @@
   {
   	int i = 0;
   
  -	if (!el->should_run) {
  +	if (!el->should_run && ((el->handler->type & HTYPE_NORMAL) != 0)) {
   		return 0;
   	}
   
  @@ -421,8 +421,7 @@
   
   int execute_children(element_s *element)
   {
  -	return execute_children_filtered(element,
  -					 HTYPE_NORMAL | HTYPE_PACKAGE);
  +	return execute_children_filtered(element, HTYPE_NORMAL);
   }
   
   int execute_children_filtered(element_s *element, handler_type_e type_filter)
  
  
  
  1.55      +14 -7     ALFS/nALFS/src/nalfs.c
  
  Index: nalfs.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/nalfs.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- nalfs.c	27 Mar 2004 19:51:56 -0000	1.54
  +++ nalfs.c	27 Mar 2004 21:37:57 -0000	1.55
  @@ -240,11 +240,11 @@
   {
   	element_s *child;
   
  -
  -	el->marked = mark;
  +	if ((el->handler->type & HTYPE_NORMAL) != 0)
  +		el->marked = mark;
   
   	for (child = el->children; child; child = child->next) {
  -		do_mark_element(child, el->marked);
  +		do_mark_element(child, mark);
   	}
   }
   
  @@ -252,7 +252,6 @@
   {
   	element_s *parent;
   
  -
   	do_mark_element(el, el->marked ? 0 : 1);
   
   	/* Mark/unmark all our parents, if needed. */
  @@ -372,14 +371,20 @@
   	run_status_e status = RUN_STATUS_NONE;
   
   	for (child = el->children; child; child = child->next) {
  -		if ((child->handler->type & HTYPE_NORMAL) == 0)
  -			continue;
  -		child_normal++;
   		switch (child->run_status) {
   		case RUN_STATUS_RUNNING:
   			return child->run_status;
   		case RUN_STATUS_FAILED:
   			return child->run_status;
  +		default:
  +			break;
  +		}
  +
  +		if ((child->handler->type & HTYPE_NORMAL) == 0)
  +			continue;
  +		child_normal++;
  +
  +		switch (child->run_status) {
   		case RUN_STATUS_NONE:
   			child_status_none++;
   			break;
  @@ -388,6 +393,8 @@
   			break;
   		case RUN_STATUS_SOME_DONE:
   			child_status_some_done++;
  +			break;
  +		default:
   			break;
   		}
   	}
  
  
  



More information about the alfs-log mailing list