Remove conflicting declaration of malloc(); include <stdlib.h> instead.

3 files changed, 78 insertions, 19 deletions

diff --git a/benchmarks/nettest/distinfo b/benchmarks/nettest/distinfo
index 6fd942b9a1b..3fbb1d218f3 100644
--- a/benchmarks/nettest/distinfo
+++ b/benchmarks/nettest/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/12/13 15:12:59 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/06/21 14:27:28 minskim Exp $
 
 SHA1 (nettest.92.11.09.tar.Z) = 745408751115784f8f5dc63b16428eb1404d6c5e
 RMD160 (nettest.92.11.09.tar.Z) = dadf2688c5d57dc019df7267f35089e70a92bd79
 Size (nettest.92.11.09.tar.Z) = 35068 bytes
 SHA1 (patch-aa) = 17f5b23a2813e46fa710e6fd810d5c6e7d9cb7b4
 SHA1 (patch-ab) = e96227451fce253cd77491cfa2214fa49651af15
-SHA1 (patch-ac) = a76e6ce16d984b811cc861d445289dec0d48f40b
-SHA1 (patch-ad) = fa86a0ba0ddd9e7c8f432800e0d098971c7f6674
+SHA1 (patch-ac) = 7c6f6abf3012c81d8898c4ef21936e0e89d108dd
+SHA1 (patch-ad) = bf34d0ccd2ed7eda77ff728d56513b7602ddee8a
diff --git a/benchmarks/nettest/patches/patch-ac b/benchmarks/nettest/patches/patch-ac
index bf7dc227952..80100a42223 100644
--- a/benchmarks/nettest/patches/patch-ac
+++ b/benchmarks/nettest/patches/patch-ac
@@ -1,8 +1,16 @@
-$NetBSD: patch-ac,v 1.3 2004/08/22 23:27:16 jschauma Exp $
+$NetBSD: patch-ac,v 1.4 2006/06/21 14:27:28 minskim Exp $
 
---- nettest.c.orig	1992-11-05 16:52:58.000000000 -0500
-+++ nettest.c	2004-08-22 19:25:48.000000000 -0400
-@@ -45,6 +45,9 @@
+--- nettest.c.orig	1992-11-05 21:52:58.000000000 +0000
++++ nettest.c
+@@ -37,6 +37,7 @@ char copyright[] =
+ "@(#) Copyright 1992 Cray Research, Inc.\n\
+  All rights reserved.\n";
+ 
++#include <stdlib.h>
+ #define SRCRT
+ #include "nettest.h"
+ #ifdef BSD44
+@@ -45,6 +46,9 @@ char copyright[] =
  #if defined(BSD44) || defined(sun) || defined(ultrix) || defined(sgi)
  #include <netinet/in_systm.h>
  #endif
@@ -12,7 +20,7 @@ $NetBSD: patch-ac,v 1.3 2004/08/22 23:27:16 jschauma Exp $
  #include <sys/wait.h>
  #include <sys/un.h>
  #include <netinet/tcp.h>
-@@ -92,8 +95,12 @@
+@@ -92,8 +96,12 @@ int	kbufsize = 0;
  int	nodelay = 0;
  int	mesghdr = 0;
  
@@ -26,7 +34,7 @@ $NetBSD: patch-ac,v 1.3 2004/08/22 23:27:16 jschauma Exp $
  #define	GETTIMES(a, b)	ftime(&a); times(&b);
  #define	TIMETYPE	struct timeb
  #else
-@@ -126,7 +133,12 @@
+@@ -126,7 +134,12 @@ struct	sockaddr_iso to_s = {sizeof(to_s)
  
  void do_children(), do_stream(), usage(), do_dgram(), prtimes();
  
@@ -40,7 +48,7 @@ $NetBSD: patch-ac,v 1.3 2004/08/22 23:27:16 jschauma Exp $
  
  int (*rfunc)() = read;
  
-@@ -550,7 +562,11 @@
+@@ -550,7 +563,11 @@ main(argc, argv)
  			shutdown(s, 2);
  			exit(0);
  		}
@@ -52,7 +60,32 @@ $NetBSD: patch-ac,v 1.3 2004/08/22 23:27:16 jschauma Exp $
  			perror("connect");
  			exit(1);
  		}
-@@ -1160,8 +1176,8 @@
+@@ -602,7 +619,6 @@ do_children(nconnections)
+ 	register int i;
+ 	int n;
+ 	struct children *childrenp;
+-	char *malloc();
+ 	int status, child_error = 0;
+ 	int notready = 0, nchildren;
+ 	struct tms	tms1, tms2;
+@@ -852,7 +868,7 @@ do_stream(in, out)
+ {
+ 	register int	i, t, j, offset = 0, t2;
+ 	register char	*cp;
+-	char		buf[128], *data, *malloc(), *orgdata;
++	char		buf[128], *data, *orgdata;
+ 	long		*cnts;
+ 	register long	*ldp;
+ 	struct tms	tms1, tms2, tms3;
+@@ -1135,7 +1151,6 @@ do_dgram(s)
+ {
+ 	register int	ret, i;
+ 	register char	*data;
+-	char		*malloc();
+ 	struct tms	tms1, tms2;
+ 	TIMETYPE	start, end;
+ 	struct msghdr	outmsg;
+@@ -1160,8 +1175,8 @@ do_dgram(s)
  	*data = 0;
  	for (i = 0; i < nchunks; i++) {
  		ret = mesghdr ? sendmsg(s, &outmsg, 0)
@@ -63,7 +96,7 @@ $NetBSD: patch-ac,v 1.3 2004/08/22 23:27:16 jschauma Exp $
  
  		if (ret < 0) {
  			perror(mesghdr ? "sendmsg" : "sendto");
-@@ -1397,12 +1413,13 @@
+@@ -1397,12 +1412,13 @@ parsetos(name, proto)
  	register char	*c;
  	int		tos;
  
diff --git a/benchmarks/nettest/patches/patch-ad b/benchmarks/nettest/patches/patch-ad
index d51a510f8d5..fe7dcaf99b3 100644
--- a/benchmarks/nettest/patches/patch-ad
+++ b/benchmarks/nettest/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.4 2005/12/13 15:12:59 joerg Exp $
+$NetBSD: patch-ad,v 1.5 2006/06/21 14:27:28 minskim Exp $
 
 --- nettestd.c.orig	1992-11-05 21:52:58.000000000 +0000
 +++ nettestd.c
-@@ -107,7 +107,12 @@ union {
+@@ -42,6 +42,7 @@ char copyright[] =
+ 
+ #include <errno.h>
+ #include <signal.h>
++#include <stdlib.h>
+ #ifdef	WAIT3CODE
+ #include <sys/wait.h>
+ #endif
+@@ -107,7 +108,12 @@ union {
  } name;
  int namesize;
  
@@ -16,7 +24,7 @@ $NetBSD: patch-ad,v 1.4 2005/12/13 15:12:59 joerg Exp $
  int (*rfunc)() = read;
  
  main(argc, argv)
-@@ -271,7 +276,11 @@ char **argv;
+@@ -271,7 +277,11 @@ char **argv;
  # endif
  #endif
  	if (daemon) {
@@ -28,7 +36,7 @@ $NetBSD: patch-ad,v 1.4 2005/12/13 15:12:59 joerg Exp $
  			perror("setpgrp");
  		if ((c = open(_PATH_TTY, O_RDWR)) >= 0) {
  			(void)ioctl(c, TIOCNOTTY, (char *)0);
-@@ -416,7 +425,7 @@ char **argv;
+@@ -416,7 +426,7 @@ char **argv;
  			    )
  			error("setsockopt (IP_OPTIONS)");
  #endif
@@ -37,7 +45,7 @@ $NetBSD: patch-ad,v 1.4 2005/12/13 15:12:59 joerg Exp $
  			error("bind");
  			exit(1);
  		}
-@@ -447,12 +456,11 @@ register int s;
+@@ -447,12 +457,11 @@ register int s;
  #endif
  	listen(s, 5);
  
@@ -52,7 +60,25 @@ $NetBSD: patch-ad,v 1.4 2005/12/13 15:12:59 joerg Exp $
  			if (errno == EINTR)
  				continue;
  			error("accept");
-@@ -707,7 +715,9 @@ int s;
+@@ -516,7 +525,7 @@ register in, out;
+ {
+ 	register int	i, t, offset = 0;
+ 	register char	*cp, *data;
+-	char		buf[128], *malloc();
++	char		buf[128];
+ 	int		chunks = 0, chunksize = 0, fullbuf = 0, kbufsize = 0;
+ 	int		tos = 0, nodelay = 0, seqdata = 0, waitall = 0;
+ 	register unsigned long hival, loval;
+@@ -684,7 +693,7 @@ int s;
+ 	register int		t, t2;
+ 	register char		*cp, *data;
+ 	register struct hostent	*hp;
+-	char			*inet_ntoa(), *malloc();
++	char			*inet_ntoa();
+ 	register char		*errmsg;
+ #ifdef	CMSG_DATA
+ 	struct msghdr		inmsg;
+@@ -707,7 +716,9 @@ int s;
  		inmsg.msg_iovlen = 1;
  		inmsg.msg_name = (caddr_t)&name.d_inet;
  		inmsg.msg_control = (caddr_t)control;
@@ -62,7 +88,7 @@ $NetBSD: patch-ad,v 1.4 2005/12/13 15:12:59 joerg Exp $
  		errmsg = "recvmsg";
  	} else
  #endif /* CMSG_DATA */
-@@ -723,7 +733,7 @@ int s;
+@@ -723,7 +734,7 @@ int s;
  #endif
  		{
  			namesize = sizeof(name.d_inet);