===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/window/Attic/win.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/window/Attic/win.c	1997/02/25 00:04:32	1.5
--- src/usr.bin/window/Attic/win.c	2001/11/19 19:02:18	1.6
***************
*** 1,4 ****
! /*	$OpenBSD: win.c,v 1.5 1997/02/25 00:04:32 downsj Exp $	*/
  /*	$NetBSD: win.c,v 1.8 1996/02/08 21:07:57 mycroft Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: win.c,v 1.6 2001/11/19 19:02:18 mpech Exp $	*/
  /*	$NetBSD: win.c,v 1.8 1996/02/08 21:07:57 mycroft Exp $	*/
  
  /*
***************
*** 41,47 ****
  #if 0
  static char sccsid[] = "@(#)win.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: win.c,v 1.5 1997/02/25 00:04:32 downsj Exp $";
  #endif
  #endif /* not lint */
  
--- 41,47 ----
  #if 0
  static char sccsid[] = "@(#)win.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: win.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 73,79 ****
  char *label;
  char *shf, **sh;
  {
! 	register struct ww *w;
  
  	if (id < 0 && (id = findid()) < 0)
  		return 0;
--- 73,79 ----
  char *label;
  char *shf, **sh;
  {
! 	struct ww *w;
  
  	if (id < 0 && (id = findid()) < 0)
  		return 0;
***************
*** 113,119 ****
  
  findid()
  {
! 	register i;
  
  	for (i = 0; i < NWINDOW && window[i] != 0; i++)
  		;
--- 113,119 ----
  
  findid()
  {
! 	int i;
  
  	for (i = 0; i < NWINDOW && window[i] != 0; i++)
  		;
***************
*** 127,134 ****
  struct ww *
  findselwin()
  {
! 	register struct ww *w, *s = 0;
! 	register i;
  
  	for (i = 0; i < NWINDOW; i++)
  		if ((w = window[i]) != 0 && w != selwin &&
--- 127,134 ----
  struct ww *
  findselwin()
  {
! 	struct ww *w, *s = 0;
! 	int i;
  
  	for (i = 0; i < NWINDOW; i++)
  		if ((w = window[i]) != 0 && w != selwin &&
***************
*** 142,151 ****
   * Close a user window.  Close all if w == 0.
   */
  closewin(w)
! register struct ww *w;
  {
  	char didit = 0;
! 	register i;
  
  	if (w != 0) {
  		closewin1(w);
--- 142,151 ----
   * Close a user window.  Close all if w == 0.
   */
  closewin(w)
! struct ww *w;
  {
  	char didit = 0;
! 	int i;
  
  	if (w != 0) {
  		closewin1(w);
***************
*** 178,184 ****
  openiwin(nrow, label)
  char *label;
  {
! 	register struct ww *w;
  
  	if ((w = wwopen(WWT_INTERNAL, 0, nrow, wwncol, 2, 0, 0)) == 0)
  		return 0;
--- 178,184 ----
  openiwin(nrow, label)
  char *label;
  {
! 	struct ww *w;
  
  	if ((w = wwopen(WWT_INTERNAL, 0, nrow, wwncol, 2, 0, 0)) == 0)
  		return 0;
***************
*** 202,208 ****
  }
  
  closewin1(w)
! register struct ww *w;
  {
  	if (w == selwin)
  		selwin = 0;
--- 202,208 ----
  }
  
  closewin1(w)
! struct ww *w;
  {
  	if (w == selwin)
  		selwin = 0;
***************
*** 224,230 ****
   * Always reframe() if doreframe is true.
   */
  front(w, doreframe)
! register struct ww *w;
  char doreframe;
  {
  	if (w->ww_back != (isfg(w) ? framewin : fgwin) && !wwvisible(w)) {
--- 224,230 ----
   * Always reframe() if doreframe is true.
   */
  front(w, doreframe)
! struct ww *w;
  char doreframe;
  {
  	if (w->ww_back != (isfg(w) ? framewin : fgwin) && !wwvisible(w)) {
***************
*** 241,247 ****
   * For normal windows, we put it behind the current window.
   */
  addwin(w, fg)
! register struct ww *w;
  char fg;
  {
  	if (fg) {
--- 241,247 ----
   * For normal windows, we put it behind the current window.
   */
  addwin(w, fg)
! struct ww *w;
  char fg;
  {
  	if (fg) {
***************
*** 257,263 ****
   * Delete a window.
   */
  deletewin(w)
! register struct ww *w;
  {
  	if (fgwin == w)
  		fgwin = w->ww_back;
--- 257,263 ----
   * Delete a window.
   */
  deletewin(w)
! struct ww *w;
  {
  	if (fgwin == w)
  		fgwin = w->ww_back;
***************
*** 266,272 ****
  
  reframe()
  {
! 	register struct ww *w;
  
  	wwunframe(framewin);
  	for (w = wwhead.ww_back; w != &wwhead; w = w->ww_back)
--- 266,272 ----
  
  reframe()
  {
! 	struct ww *w;
  
  	wwunframe(framewin);
  	for (w = wwhead.ww_back; w != &wwhead; w = w->ww_back)
***************
*** 277,283 ****
  }
  
  labelwin(w)
! register struct ww *w;
  {
  	int mode = w == selwin ? WWM_REV : 0;
  
--- 277,283 ----
  }
  
  labelwin(w)
! struct ww *w;
  {
  	int mode = w == selwin ? WWM_REV : 0;
  
***************
*** 303,309 ****
  }
  
  stopwin(w)
! 	register struct ww *w;
  {
  	if (w->ww_pty >= 0 && w->ww_type == WWT_PTY && wwstoptty(w->ww_pty) < 0)
  		error("Can't stop output: %s.", wwerror());
--- 303,309 ----
  }
  
  stopwin(w)
! 	struct ww *w;
  {
  	if (w->ww_pty >= 0 && w->ww_type == WWT_PTY && wwstoptty(w->ww_pty) < 0)
  		error("Can't stop output: %s.", wwerror());
***************
*** 312,318 ****
  }
  
  startwin(w)
! 	register struct ww *w;
  {
  	if (w->ww_pty >= 0 && w->ww_type == WWT_PTY && wwstarttty(w->ww_pty) < 0)
  		error("Can't start output: %s.", wwerror());
--- 312,318 ----
  }
  
  startwin(w)
! 	struct ww *w;
  {
  	if (w->ww_pty >= 0 && w->ww_type == WWT_PTY && wwstarttty(w->ww_pty) < 0)
  		error("Can't start output: %s.", wwerror());
***************
*** 321,327 ****
  }
  
  sizewin(w, nrow, ncol)
! register struct ww *w;
  {
  	struct ww *back = w->ww_back;
  
--- 321,327 ----
  }
  
  sizewin(w, nrow, ncol)
! struct ww *w;
  {
  	struct ww *back = w->ww_back;
  
***************
*** 341,347 ****
  }
  
  more(w, always)
! register struct ww *w;
  char always;
  {
  	int c;
--- 341,347 ----
  }
  
  more(w, always)
! struct ww *w;
  char always;
  {
  	int c;
***************
*** 357,363 ****
  }
  
  waitnl1(w, prompt)
! register struct ww *w;
  char *prompt;
  {
  	int uc = ISSET(w->ww_wflags, WWW_UNCTRL);
--- 357,363 ----
  }
  
  waitnl1(w, prompt)
! struct ww *w;
  char *prompt;
  {
  	int uc = ISSET(w->ww_wflags, WWW_UNCTRL);