Subject: Re: bin/29433
To: None <gnats-admin@netbsd.org, netbsd-bugs@netbsd.org>
From: Max Okumoto <okumoto@ucsd.edu>
List: netbsd-bugs
Date: 02/18/2005 00:50:03
The following reply was made to PR bin/29433; it has been noted by GNATS.

From: Max Okumoto <okumoto@ucsd.edu>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: bin/29433
Date: Thu, 17 Feb 2005 16:49:54 -0800

 This is a multi-part message in MIME format.
 --------------010003060805080508030105
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Update to PR with patch
 
 --------------010003060805080508030105
 Content-Type: text/plain;
  name="p3"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="p3"
 
 diff nbsd-src fbsd-src
 diff -ru  nbsd-src/make.orig/arch.c nbsd-src/make/arch.c
 --- nbsd-src/make.orig/arch.c	Thu Feb 17 13:22:06 2005
 +++ nbsd-src/make/arch.c	Thu Feb 17 13:43:28 2005
 @@ -684,7 +684,7 @@
  #endif
  
  	    he = Hash_CreateEntry(&ar->members, memName, (Boolean *)NULL);
 -	    Hash_SetValue (he, (ClientData)emalloc (sizeof (struct ar_hdr)));
 +	    Hash_SetValue (he, emalloc (sizeof (struct ar_hdr)));
  	    memcpy ((Address)Hash_GetValue (he), (Address)&arh,
  		sizeof (struct ar_hdr));
  	}
 diff -ru  nbsd-src/make.orig/bit.h nbsd-src/make/bit.h
 --- nbsd-src/make.orig/bit.h	Thu Feb 17 13:22:06 2005
 +++ nbsd-src/make/bit.h	Thu Feb 17 13:43:35 2005
 @@ -93,7 +93,7 @@
  	(Bit_NumInts(numBits) * sizeof(int))
  
  #define Bit_Alloc(numBits, bitArrayPtr)  	\
 -        bitArrayPtr = (int *) emalloc((unsigned)Bit_NumBytes(numBits)); \
 +        bitArrayPtr = emalloc((unsigned)Bit_NumBytes(numBits)); \
          Bit_Zero((numBits), (bitArrayPtr))
  
  #define Bit_Free(bitArrayPtr)	\
 diff -ru  nbsd-src/make.orig/hash.c nbsd-src/make/hash.c
 --- nbsd-src/make.orig/hash.c	Thu Feb 17 13:22:05 2005
 +++ nbsd-src/make/hash.c	Thu Feb 17 13:41:59 2005
 @@ -144,7 +144,7 @@
  	t->numEntries = 0;
  	t->size = i;
  	t->mask = i - 1;
 -	t->bucketPtr = hp = (struct Hash_Entry **)emalloc(sizeof(*hp) * i);
 +	t->bucketPtr = hp = emalloc(sizeof(*hp) * i);
  	while (--i >= 0)
  		*hp++ = NULL;
  }
 @@ -444,7 +444,7 @@
  	i <<= 1;
  	t->size = i;
  	t->mask = mask = i - 1;
 -	t->bucketPtr = hp = (struct Hash_Entry **) emalloc(sizeof(*hp) * i);
 +	t->bucketPtr = hp = emalloc(sizeof(*hp) * i);
  	while (--i >= 0)
  		*hp++ = NULL;
  	for (hp = oldhp, i = oldsize; --i >= 0;) {
 
 --------------010003060805080508030105--