===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/dir.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/make/dir.c	2000/03/26 16:21:32	1.17
--- src/usr.bin/make/dir.c	2000/06/10 01:32:22	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: dir.c,v 1.17 2000/03/26 16:21:32 espie Exp $	*/
  /*	$NetBSD: dir.c,v 1.14 1997/03/29 16:51:26 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: dir.c,v 1.18 2000/06/10 01:32:22 espie Exp $	*/
  /*	$NetBSD: dir.c,v 1.14 1997/03/29 16:51:26 christos Exp $	*/
  
  /*
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)dir.c	8.2 (Berkeley) 1/2/94";
  #else
! static char rcsid[] = "$OpenBSD: dir.c,v 1.17 2000/03/26 16:21:32 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)dir.c	8.2 (Berkeley) 1/2/94";
  #else
! static char rcsid[] = "$OpenBSD: dir.c,v 1.18 2000/06/10 01:32:22 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 197,204 ****
  static int DirMatchFiles __P((char *, Path *, Lst));
  static void DirExpandCurly __P((char *, char *, Lst, Lst));
  static void DirExpandInt __P((char *, Lst, Lst));
! static int DirPrintWord __P((ClientData, ClientData));
! static int DirPrintDir __P((ClientData, ClientData));
  
  /*-
   *-----------------------------------------------------------------------
--- 197,204 ----
  static int DirMatchFiles __P((char *, Path *, Lst));
  static void DirExpandCurly __P((char *, char *, Lst, Lst));
  static void DirExpandInt __P((char *, Lst, Lst));
! static void DirPrintWord __P((ClientData));
! static void DirPrintDir __P((ClientData));
  
  /*-
   *-----------------------------------------------------------------------
***************
*** 534,558 ****
  /*-
   *-----------------------------------------------------------------------
   * DirPrintWord --
!  *	Print a word in the list of expansions. Callback for Dir_Expand
!  *	when DEBUG(DIR), via Lst_ForEach.
!  *
!  * Results:
!  *	=== 0
!  *
!  * Side Effects:
!  *	The passed word is printed, followed by a space.
!  *
   *-----------------------------------------------------------------------
   */
! static int
! DirPrintWord(word, dummy)
      ClientData  word;
-     ClientData  dummy;
  {
!     printf("%s ", (char *) word);
! 
!     return(dummy ? 0 : 0);
  }
  
  /*-
--- 534,548 ----
  /*-
   *-----------------------------------------------------------------------
   * DirPrintWord --
!  *	Print a word in the list of expansions, followed by a space. 
!  *	Callback for Dir_Expand when DEBUG(DIR), via Lst_ForEach.
   *-----------------------------------------------------------------------
   */
! static void
! DirPrintWord(word)
      ClientData  word;
  {
!     printf("%s ", (char *)word);
  }
  
  /*-
***************
*** 663,669 ****
  	}
      }
      if (DEBUG(DIR)) {
! 	Lst_ForEach(expansions, DirPrintWord, NULL);
  	fputc('\n', stdout);
      }
  }
--- 653,659 ----
  	}
      }
      if (DEBUG(DIR)) {
! 	Lst_Every(expansions, DirPrintWord);
  	fputc('\n', stdout);
      }
  }
***************
*** 1297,1313 ****
      }
  }
  
! static int DirPrintDir (p, dummy)
      ClientData	p;
-     ClientData	dummy;
  {
!     printf ("%s ", ((Path *) p)->name);
!     return (dummy ? 0 : 0);
  }
  
  void
! Dir_PrintPath (path)
      Lst	path;
  {
!     Lst_ForEach(path, DirPrintDir, NULL);
  }
--- 1287,1301 ----
      }
  }
  
! static void DirPrintDir(p)
      ClientData	p;
  {
!     printf("%s ", ((Path *)p)->name);
  }
  
  void
! Dir_PrintPath(path)
      Lst	path;
  {
!     Lst_Every(path, DirPrintDir);
  }