===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsprog.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -c -r1.147 -r1.148
*** src/usr.bin/rcs/rcsprog.c	2009/02/15 12:58:01	1.147
--- src/usr.bin/rcs/rcsprog.c	2010/07/23 08:31:19	1.148
***************
*** 1,4 ****
! /*	$OpenBSD: rcsprog.c,v 1.147 2009/02/15 12:58:01 joris Exp $	*/
  /*
   * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsprog.c,v 1.148 2010/07/23 08:31:19 ray Exp $	*/
  /*
   * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 60,66 ****
  	{ "merge",	merge_main,	merge_usage	},
  };
  
! struct rcs_wklhead rcs_temp_files;
  
  void sighdlr(int);
  static void  rcs_attach_symbol(RCSFILE *, const char *);
--- 60,66 ----
  	{ "merge",	merge_main,	merge_usage	},
  };
  
! struct wklhead temp_files;
  
  void sighdlr(int);
  static void  rcs_attach_symbol(RCSFILE *, const char *);
***************
*** 69,75 ****
  void
  sighdlr(int sig)
  {
! 	rcs_worklist_clean(&rcs_temp_files, rcs_worklist_unlink);
  	_exit(1);
  }
  
--- 69,75 ----
  void
  sighdlr(int sig)
  {
! 	worklist_clean(&temp_files, worklist_unlink);
  	_exit(1);
  }
  
***************
*** 129,135 ****
  
  	ret = -1;
  	rcs_optind = 1;
! 	SLIST_INIT(&rcs_temp_files);
  
  	cmd_argc = build_cmd(&cmd_argv, argv, argc);
  
--- 129,135 ----
  
  	ret = -1;
  	rcs_optind = 1;
! 	SLIST_INIT(&temp_files);
  
  	cmd_argc = build_cmd(&cmd_argv, argv, argc);
  
***************
*** 151,157 ****
  		}
  
  	/* clean up temporary files */
! 	rcs_worklist_run(&rcs_temp_files, rcs_worklist_unlink);
  
  	exit(ret);
  }
--- 151,157 ----
  		}
  
  	/* clean up temporary files */
! 	worklist_run(&temp_files, worklist_unlink);
  
  	exit(ret);
  }