===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/arch.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** src/usr.bin/make/arch.c	2000/03/26 16:21:32	1.26
--- src/usr.bin/make/arch.c	2000/06/10 01:41:05	1.27
***************
*** 1,4 ****
! /*	$OpenBSD: arch.c,v 1.26 2000/03/26 16:21:32 espie Exp $	*/
  /*	$NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: arch.c,v 1.27 2000/06/10 01:41:05 espie Exp $	*/
  /*	$NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $	*/
  
  /*
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
  #else
! static char rcsid[] = "$OpenBSD: arch.c,v 1.26 2000/03/26 16:21:32 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
  #else
! static char rcsid[] = "$OpenBSD: arch.c,v 1.27 2000/06/10 01:41:05 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 129,137 ****
      size_t	  fnamesize;  /* Size of the string table */
  } Arch;
  
! static int ArchFindArchive __P((ClientData, ClientData));
  #ifdef CLEANUP
! static void ArchFree __P((ClientData));
  #endif
  static struct ar_hdr *ArchStatMember __P((char *, char *, Boolean));
  static FILE *ArchFindMember __P((char *, char *, struct ar_hdr *, char *));
--- 129,137 ----
      size_t	  fnamesize;  /* Size of the string table */
  } Arch;
  
! static int ArchFindArchive __P((void *, void *));
  #ifdef CLEANUP
! static void ArchFree __P((void *));
  #endif
  static struct ar_hdr *ArchStatMember __P((char *, char *, Boolean));
  static FILE *ArchFindMember __P((char *, char *, struct ar_hdr *, char *));
***************
*** 158,164 ****
   */
  static void
  ArchFree(ap)
!     ClientData ap;
  {
      Arch *a = (Arch *) ap;
      Hash_Search	  search;
--- 158,164 ----
   */
  static void
  ArchFree(ap)
!     void *ap;
  {
      Arch *a = (Arch *) ap;
      Hash_Search	  search;
***************
*** 168,179 ****
      for (entry = Hash_EnumFirst(&a->members, &search);
  	 entry != NULL;
  	 entry = Hash_EnumNext(&search))
! 	free((Address) Hash_GetValue (entry));
  
      free(a->name);
      efree(a->fnametab);
      Hash_DeleteTable(&a->members);
!     free((Address) a);
  }
  #endif
  
--- 168,179 ----
      for (entry = Hash_EnumFirst(&a->members, &search);
  	 entry != NULL;
  	 entry = Hash_EnumNext(&search))
! 	free(Hash_GetValue(entry));
  
      free(a->name);
      efree(a->fnametab);
      Hash_DeleteTable(&a->members);
!     free(a);
  }
  #endif
  
***************
*** 443,452 ****
   */
  static int
  ArchFindArchive (ar, archName)
!     ClientData	  ar;	      	  /* Current list element */
!     ClientData	  archName;  	  /* Name we want */
  {
!     return (strcmp ((char *) archName, ((Arch *) ar)->name));
  }
  
  /*-
--- 443,452 ----
   */
  static int
  ArchFindArchive (ar, archName)
!     void *ar;	      	  /* Current list element */
!     void *archName;  	  /* Name we want */
  {
!     return strcmp ((char *)archName, ((Arch *)ar)->name);
  }
  
  /*-
***************
*** 634,643 ****
  	    }
  #endif
  
! 	    he = Hash_CreateEntry (&ar->members, memName, NULL);
! 	    Hash_SetValue (he, emalloc (sizeof (struct ar_hdr)));
! 	    memcpy ((Address)Hash_GetValue (he), (Address)&arh,
! 		sizeof (struct ar_hdr));
  	}
  	fseek (arch, (size + 1) & ~1, SEEK_CUR);
      }
--- 634,642 ----
  	    }
  #endif
  
! 	    he = Hash_CreateEntry(&ar->members, memName, NULL);
! 	    Hash_SetValue(he, emalloc(sizeof(struct ar_hdr)));
! 	    memcpy(Hash_GetValue(he), &arh, sizeof(struct ar_hdr));
  	}
  	fseek (arch, (size + 1) & ~1, SEEK_CUR);
      }
***************
*** 659,669 ****
      }
  
  badarch:
!     fclose (arch);
!     Hash_DeleteTable (&ar->members);
      efree(ar->fnametab);
!     free ((Address)ar);
!     return (NULL);
  }
  
  #ifdef SVR4ARCHIVES
--- 658,668 ----
      }
  
  badarch:
!     fclose(arch);
!     Hash_DeleteTable(&ar->members);
      efree(ar->fnametab);
!     free(ar);
!     return NULL;
  }
  
  #ifdef SVR4ARCHIVES