===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/dir.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/make/dir.c	2000/06/10 01:32:22	1.18
--- src/usr.bin/make/dir.c	2000/06/10 01:41:05	1.19
***************
*** 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 $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: dir.c,v 1.19 2000/06/10 01:41:05 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.18 2000/06/10 01:32:22 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.19 2000/06/10 01:41:05 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 193,204 ****
  			     * should be ok, but... */
  
  
! static int DirFindName __P((ClientData, ClientData));
  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));
  
  /*-
   *-----------------------------------------------------------------------
--- 193,204 ----
  			     * should be ok, but... */
  
  
! static int DirFindName __P((void *, void *));
  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((void *));
! static void DirPrintDir __P((void *));
  
  /*-
   *-----------------------------------------------------------------------
***************
*** 277,286 ****
   */
  static int
  DirFindName (p, dname)
!     ClientData    p;	      /* Current name */
!     ClientData	  dname;      /* Desired name */
  {
!     return (strcmp (((Path *)p)->name, (char *) dname));
  }
  
  /*-
--- 277,286 ----
   */
  static int
  DirFindName (p, dname)
!     void *p;	      /* Current name */
!     void *dname;      /* Desired name */
  {
!     return strcmp(((Path *)p)->name, (char *)dname);
  }
  
  /*-
***************
*** 540,546 ****
   */
  static void
  DirPrintWord(word)
!     ClientData  word;
  {
      printf("%s ", (char *)word);
  }
--- 540,546 ----
   */
  static void
  DirPrintWord(word)
!     void *word;
  {
      printf("%s ", (char *)word);
  }
***************
*** 872,878 ****
  		entry = Hash_CreateEntry(&mtimes, (char *) file,
  					 (Boolean *)NULL);
  		/* XXX */
! 		Hash_SetValue(entry, (ClientData)((long)stb.st_mtime));
  		nearmisses += 1;
  		return (file);
  	    } else {
--- 872,878 ----
  		entry = Hash_CreateEntry(&mtimes, (char *) file,
  					 (Boolean *)NULL);
  		/* XXX */
! 		Hash_SetValue(entry, (void *)((long)stb.st_mtime));
  		nearmisses += 1;
  		return (file);
  	    } else {
***************
*** 951,957 ****
  		    name);
  	}
  	/* XXX */
! 	Hash_SetValue(entry, (ClientData)(long)stb.st_mtime);
  	return (estrdup (name));
      } else {
  	if (DEBUG(DIR)) {
--- 951,957 ----
  		    name);
  	}
  	/* XXX */
! 	Hash_SetValue(entry, (void *)(long)stb.st_mtime);
  	return (estrdup (name));
      } else {
  	if (DEBUG(DIR)) {
***************
*** 1126,1136 ****
   *
   *-----------------------------------------------------------------------
   */
! ClientData
  Dir_CopyDir(p)
!     ClientData p;
  {
!     ((Path *) p)->refCount += 1;
  
      return p;
  }
--- 1126,1136 ----
   *
   *-----------------------------------------------------------------------
   */
! void *
  Dir_CopyDir(p)
!     void *p;
  {
!     ((Path *)p)->refCount += 1;
  
      return p;
  }
***************
*** 1193,1199 ****
   */
  void
  Dir_Destroy (pp)
!     ClientData 	  pp;	    /* The directory descriptor to nuke */
  {
      Path    	  *p = (Path *) pp;
      p->refCount -= 1;
--- 1193,1199 ----
   */
  void
  Dir_Destroy (pp)
!     void *pp;	    /* The directory descriptor to nuke */
  {
      Path    	  *p = (Path *) pp;
      p->refCount -= 1;
***************
*** 1205,1212 ****
  	Lst_Remove(openDirectories, ln);
  
  	Hash_DeleteTable (&p->files);
! 	free((Address)p->name);
! 	free((Address)p);
      }
  }
  
--- 1205,1212 ----
  	Lst_Remove(openDirectories, ln);
  
  	Hash_DeleteTable (&p->files);
! 	free(p->name);
! 	free(p);
      }
  }
  
***************
*** 1287,1294 ****
      }
  }
  
! static void DirPrintDir(p)
!     ClientData	p;
  {
      printf("%s ", ((Path *)p)->name);
  }
--- 1287,1295 ----
      }
  }
  
! static void 
! DirPrintDir(p)
!     void *p;
  {
      printf("%s ", ((Path *)p)->name);
  }