cvs commit: ALFS/nALFS/src nalfs.c

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Apr 3 12:11:59 PST 2004


kpfleming    04/04/03 13:11:59

  Modified:    nALFS/src nalfs.c
  Log:
  fix mark-clearing based on run status
  
  Revision  Changes    Path
  1.57      +11 -13    ALFS/nALFS/src/nalfs.c
  
  Index: nalfs.c
  ===================================================================
  RCS file: /home/cvsroot/ALFS/nALFS/src/nalfs.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- nalfs.c	3 Apr 2004 19:58:09 -0000	1.56
  +++ nalfs.c	3 Apr 2004 20:11:59 -0000	1.57
  @@ -233,7 +233,7 @@
   	}
   }
   
  -static void clear_marks(element_s *el, int all)
  +static void clear_done_marks(element_s *el)
   {
   	element_s *child;
   
  @@ -242,16 +242,14 @@
   	 *        if they don't contain any marked children.
   	 */
   
  -	if (all) {
  -		unmark_element(el, 1);
  -	} else {
  -		if (el->run_status == RUN_STATUS_DONE) {
  -			unmark_element(el, 0);
  -		}
  -		for (child = el->children; child; child = child->next) {
  -			clear_marks(child, all);
  -		}
  -	}
  +	if ((el->handler->type & HTYPE_NORMAL) == 0)
  +		return;
  +
  +	if (el->run_status == RUN_STATUS_DONE)
  +		unmark_element(el, 0);
  +
  +	for (child = el->children; child; child = child->next)
  +		clear_done_marks(child);
   }
   
   /*
  @@ -3636,7 +3634,7 @@
   				break;
   			}
   
  -			clear_marks(root_element, 0); /* Only successful. */
  +			clear_done_marks(root_element);
   			rewrite_main();
   
   			Nprint("Successfully ended elements unmarked.");
  @@ -3654,7 +3652,7 @@
   				break;
   			}
   
  -			clear_marks(root_element, 1); /* All. */
  +			unmark_element(root_element, 1); /* All. */
   			rewrite_main();
   
   			Nprint("All elements unmarked.");
  
  
  



More information about the alfs-log mailing list