Fix 64-bit problems as detected by gcc. One must declare functions

returning pointers before calling them.

18 files changed, 264 insertions, 18 deletions

diff --git a/net/nocol/distinfo b/net/nocol/distinfo
index 0e4942f7e33..1156d59b8c2 100644
--- a/net/nocol/distinfo
+++ b/net/nocol/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2012/09/09 19:26:39 dholland Exp $
+$NetBSD: distinfo,v 1.15 2012/09/09 19:35:20 dholland Exp $
 
 SHA1 (nocol-4.3.1.tar.gz) = a8cb88727bc3a3ddd544792407d431b3ef13a325
 RMD160 (nocol-4.3.1.tar.gz) = 77a57ae447f0a8f1ce2417d9b828710f21865cc8
@@ -12,14 +12,28 @@ SHA1 (patch-ah) = 14091c7a6c8de7dd451e4292f2d0121ab3643158
 SHA1 (patch-ai) = d8317fad7c5e4574fa980859762f5acb1a7c631d
 SHA1 (patch-aj) = 0eb201f47864132b04702fab4d03e452c07c2e2a
 SHA1 (patch-ak) = 8013fbe6dbff80749dbdc0d0fad391741e48a468
-SHA1 (patch-al) = aa4fa83d53c72e17ea9ffe2685f326ebbbde9132
+SHA1 (patch-al) = a6abfabbd944c760fcb4fc1b60a3d9f8606ab5c1
 SHA1 (patch-am) = 3729dd89c58bc3fcd6bffe16cd7b275ba841be9d
 SHA1 (patch-an) = 1a869a8a2e4e0c5a29540bff7d1da76e4d8c74e9
 SHA1 (patch-ao) = 114ebcc55d00981cc6709095f3280509880d76eb
-SHA1 (patch-ap) = 45f30a886adda7831df056cf0f7a136b97a7e17d
-SHA1 (patch-aq) = 13697bbaed2c324851810d6df7677ff807844a6e
+SHA1 (patch-ap) = 0c7ca32c9d00eb493df3ff2b1c441e6c1e1aa34e
+SHA1 (patch-aq) = 0277f571bf0eb664270cb1350512a586d08376a5
 SHA1 (patch-ar) = cba8de7526efde9d8598b9119ca8d27e3c60279f
 SHA1 (patch-as) = be1b999af6459b83fe7bfcab9e83b2e830198da6
 SHA1 (patch-at) = c49b96d1c2158d0a8f67228922f0e4bff5df2908
 SHA1 (patch-au) = a8bbcb0eef41ac514bb1106c5feedb5bc087aac7
+SHA1 (patch-etherload_bpf_c) = 2d11b411693b8bca39954da47bc2fc9afb1fc273
+SHA1 (patch-etherload_get__devlist_c) = dc03458a5ba5d825371dafced876de4c80228fb3
+SHA1 (patch-etherload_main_c) = 4d1c117635328cd1fc4f0120451d1c6ef7e23ee3
+SHA1 (patch-etherload_nocol__specific_c) = 16c9c6ec50b56dbf4e35498eb09ee04e788f901b
+SHA1 (patch-etherload_util_c) = 964e84020af0ac2903aa7fb87512b81be67cb1fe
+SHA1 (patch-genmon_genmon_c) = cb07a91c2e9ae3f28f59578563b994bd3557018b
+SHA1 (patch-lib_misc_c) = 486f954d2554907c17822525f5ba33e75a581943
+SHA1 (patch-netconsole_netconsole_c) = 08283ba29c0ff63dbc23501011a7c3e56b272d0a
+SHA1 (patch-netconsole_read__filter_c) = 03e5a0e3a5ffad7b5260c3902dfb505d52927522
+SHA1 (patch-netconsole_utils_c) = 40bfc9bee53f6c77ccf7674bdb0ab153e56eadc3
+SHA1 (patch-noclog_noclogd_c) = 65409b1768de39eb8341af9aafb9d7a81c9622bb
+SHA1 (patch-nsmon_main_c) = 26992f1cc7b4cbfac3f968937ee9533b9c55d126
 SHA1 (patch-strerror_c) = 566959a5784ea640c269b247cdd1ad5ad988882e
+SHA1 (patch-tknocol_ndaemon_c) = 5e99d671b3bbf2480b9dd844db5b9d2d66fbe220
+SHA1 (patch-utility_display__nocol__datafile_c) = 6c7796043658fa6e56d2ccf4a0b5346007aea537
diff --git a/net/nocol/patches/patch-al b/net/nocol/patches/patch-al
index 1faab963aad..9f95238ffb7 100644
--- a/net/nocol/patches/patch-al
+++ b/net/nocol/patches/patch-al
@@ -1,18 +1,22 @@
-$NetBSD: patch-al,v 1.1 2002/08/08 17:49:00 wiz Exp $
+$NetBSD: patch-al,v 1.2 2012/09/09 19:35:20 dholland Exp $
 
---- portmon/portmon.c.orig	Thu Apr  6 21:32:26 2000
+--- portmon/portmon.c.orig	2000-04-06 19:32:26.000000000 +0000
 +++ portmon/portmon.c
-@@ -180,7 +180,7 @@ main(ac, av)
- 	else
+@@ -81,4 +81,6 @@ static char rcsid[] = "$Id: portmon.c,v 
+ #endif
+ 
++#include <stdlib.h>
++
+ #include "portmon.h"
+ 
+@@ -181,5 +183,5 @@ main(ac, av)
  	{
  	  update_event(&v, harray[i]->status,
 -		       /* value */ (u_long)(harray[i]->status),
 +		       /* value */ (u_long)(harray[i]->elapsedsecs),
  		       harray[i]->testseverity) ;
  	  lseek(fdout, -(off_t)sizeof(v), SEEK_CUR);
- 	  write(fdout, (char *)&v, sizeof(v));
-@@ -658,16 +658,21 @@ static char *Strcasestr(haystack, needle
-     s1 = haystack; s2 = needle; n = needlelen;
+@@ -659,14 +661,19 @@ static char *Strcasestr(haystack, needle
      do
      {
 -      if (tolower(*s1) != tolower(*s2++)  || *s1 == 0)	/* */
@@ -36,4 +40,3 @@ $NetBSD: patch-al,v 1.1 2002/08/08 17:49:00 wiz Exp $
 -  haystack--;
    return ((char *)haystack);
  }	/* Strcasestr() */
- 
diff --git a/net/nocol/patches/patch-ap b/net/nocol/patches/patch-ap
index 6e34edde098..955cc375c3e 100644
--- a/net/nocol/patches/patch-ap
+++ b/net/nocol/patches/patch-ap
@@ -1,8 +1,11 @@
-$NetBSD: patch-ap,v 1.1 2005/12/27 13:47:11 joerg Exp $
+$NetBSD: patch-ap,v 1.2 2012/09/09 19:35:20 dholland Exp $
 
---- tpmon/tpmon.c.orig	2005-12-18 20:32:14.000000000 +0000
+- use standard headers
+- don't declare own errno
+
+--- tpmon/tpmon.c.orig	1998-07-31 18:35:34.000000000 +0000
 +++ tpmon/tpmon.c
-@@ -30,7 +30,7 @@
+@@ -30,13 +30,15 @@
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
@@ -11,7 +14,15 @@ $NetBSD: patch-ap,v 1.1 2005/12/27 13:47:11 joerg Exp $
  #include <time.h>
  #include <sys/time.h>
  
-@@ -47,7 +47,6 @@
+ #include <netinet/in.h>
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <netdb.h>
+ #ifndef NeXT
+ #  include <unistd.h>
+@@ -47,7 +49,6 @@
  #include "osdefs.h"		/* definition of RAND */
  
  extern char *prognm;
diff --git a/net/nocol/patches/patch-aq b/net/nocol/patches/patch-aq
index 4c710d7f593..e765fec337a 100644
--- a/net/nocol/patches/patch-aq
+++ b/net/nocol/patches/patch-aq
@@ -1,6 +1,9 @@
-$NetBSD: patch-aq,v 1.1 2005/12/27 13:47:11 joerg Exp $
+$NetBSD: patch-aq,v 1.2 2012/09/09 19:35:20 dholland Exp $
 
---- etherload/externs.h.orig	2005-12-18 20:31:44.000000000 +0000
+- don't declare own errno
+- declare own external functions properly
+
+--- etherload/externs.h.orig	1997-08-22 05:52:10.000000000 +0000
 +++ etherload/externs.h
 @@ -14,7 +14,6 @@ extern int		breakscan;
  extern int		sleepsecs;
@@ -10,3 +13,8 @@ $NetBSD: patch-aq,v 1.1 2005/12/27 13:47:11 joerg Exp $
  extern int		extended;
  extern int		ninterfaces;
  extern int		truncation;
+@@ -44,3 +43,4 @@ void			usage();
+ void			wakeup();
+ void			flush_device();
+ 
++char **get_devlist(void);
diff --git a/net/nocol/patches/patch-etherload_bpf_c b/net/nocol/patches/patch-etherload_bpf_c
new file mode 100644
index 00000000000..8878dc56ef3
--- /dev/null
+++ b/net/nocol/patches/patch-etherload_bpf_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-etherload_bpf_c,v 1.1 2012/09/09 19:35:20 dholland Exp $
+
+Use standard headers.
+
+--- etherload/bpf.c~	1997-08-22 05:44:36.000000000 +0000
++++ etherload/bpf.c
+@@ -43,6 +43,8 @@ static char *RCSid = "$Header: /home/vik
+ #include <net/if.h>
+ #include <signal.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <errno.h>
+ 
+ /* #include <netinet/in.h>	/* */
diff --git a/net/nocol/patches/patch-etherload_get__devlist_c b/net/nocol/patches/patch-etherload_get__devlist_c
new file mode 100644
index 00000000000..0dd2b65017a
--- /dev/null
+++ b/net/nocol/patches/patch-etherload_get__devlist_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-etherload_get__devlist_c,v 1.1 2012/09/09 19:35:20 dholland Exp $
+
+Use own headers.
+
+--- etherload/get_devlist.c~	1997-03-12 08:43:08.000000000 +0000
++++ etherload/get_devlist.c
+@@ -22,6 +22,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++#include "externs.h"
++
+ /* Not all systems have IFF_LOOPBACK */
+ #ifdef IFF_LOOPBACK
+ #define ISLOOPBACK(p) ((p)->ifr_flags & IFF_LOOPBACK)
diff --git a/net/nocol/patches/patch-etherload_main_c b/net/nocol/patches/patch-etherload_main_c
new file mode 100644
index 00000000000..749487ae525
--- /dev/null
+++ b/net/nocol/patches/patch-etherload_main_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-etherload_main_c,v 1.1 2012/09/09 19:35:20 dholland Exp $
+
+Use standard headers.
+
+--- etherload/main.c~	1997-08-22 05:58:22.000000000 +0000
++++ etherload/main.c
+@@ -65,6 +65,7 @@ static char *RCSid = "$Id: main.c,v 1.5 
+ #include <signal.h>
+ #include <errno.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ 
diff --git a/net/nocol/patches/patch-etherload_nocol__specific_c b/net/nocol/patches/patch-etherload_nocol__specific_c
new file mode 100644
index 00000000000..de0e7414039
--- /dev/null
+++ b/net/nocol/patches/patch-etherload_nocol__specific_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-etherload_nocol__specific_c,v 1.1 2012/09/09 19:35:20 dholland Exp $
+
+Use standard headers.
+
+--- etherload/nocol_specific.c~	1997-08-22 06:10:16.000000000 +0000
++++ etherload/nocol_specific.c
+@@ -34,6 +34,7 @@ static char *RCSid = "$Header: /home/vik
+  */
+ 
+ 
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #include "nocol.h"
diff --git a/net/nocol/patches/patch-etherload_util_c b/net/nocol/patches/patch-etherload_util_c
new file mode 100644
index 00000000000..670a7eb483c
--- /dev/null
+++ b/net/nocol/patches/patch-etherload_util_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-etherload_util_c,v 1.1 2012/09/09 19:35:20 dholland Exp $
+
+Use standard headers.
+
+--- etherload/util.c~	1997-10-19 02:02:31.000000000 +0000
++++ etherload/util.c
+@@ -43,6 +43,7 @@ static char *RCSid = "$Header: /home/vik
+ #include <curses.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ 
+ #include "etherload.h"
diff --git a/net/nocol/patches/patch-genmon_genmon_c b/net/nocol/patches/patch-genmon_genmon_c
new file mode 100644
index 00000000000..14611a2988a
--- /dev/null
+++ b/net/nocol/patches/patch-genmon_genmon_c
@@ -0,0 +1,17 @@
+$NetBSD: patch-genmon_genmon_c,v 1.1 2012/09/09 19:35:21 dholland Exp $
+
+Functions returning pointers must be declared before being called.
+(The function in question does not appear to be in any header file
+and it isn't clear which if any it should be added to.)
+
+--- genmon/genmon.c~	1998-07-15 16:27:49.000000000 +0000
++++ genmon/genmon.c
+@@ -56,6 +56,8 @@
+ #include <sys/file.h>			/* for access() defines */
+ #include <string.h>
+ 
++EVENT *logstr_to_event(char *s);
++
+ #ifndef SLEEPTIME
+ # define SLEEPTIME  15			/* after each popen()  */
+ #endif
diff --git a/net/nocol/patches/patch-lib_misc_c b/net/nocol/patches/patch-lib_misc_c
new file mode 100644
index 00000000000..c419e638384
--- /dev/null
+++ b/net/nocol/patches/patch-lib_misc_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_misc_c,v 1.1 2012/09/09 19:35:21 dholland Exp $
+
+Use standard headers.
+
+--- lib/misc.c~	1999-11-05 22:34:12.000000000 +0000
++++ lib/misc.c
+@@ -49,6 +49,8 @@
+ #include "nocol.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <signal.h>				/* signal numbers	*/
+ #include <sys/file.h>
+ #include <errno.h>
diff --git a/net/nocol/patches/patch-netconsole_netconsole_c b/net/nocol/patches/patch-netconsole_netconsole_c
new file mode 100644
index 00000000000..270e52ad8f1
--- /dev/null
+++ b/net/nocol/patches/patch-netconsole_netconsole_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-netconsole_netconsole_c,v 1.1 2012/09/09 19:35:21 dholland Exp $
+
+Use standard headers.
+
+--- netconsole/netconsole.c~	1999-11-01 05:39:53.000000000 +0000
++++ netconsole/netconsole.c
+@@ -79,6 +79,8 @@
+  ** INCLUDES
+  */
+ 
++#include <stdlib.h>
++
+ #include	"netconsole.h"			/* application specific	*/
+ 
+ /*
diff --git a/net/nocol/patches/patch-netconsole_read__filter_c b/net/nocol/patches/patch-netconsole_read__filter_c
new file mode 100644
index 00000000000..1db6631567e
--- /dev/null
+++ b/net/nocol/patches/patch-netconsole_read__filter_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-netconsole_read__filter_c,v 1.1 2012/09/09 19:35:21 dholland Exp $
+
+Use standard headers.
+
+--- netconsole/read_filter.c~	1994-11-29 20:41:09.000000000 +0000
++++ netconsole/read_filter.c
+@@ -28,6 +28,9 @@
+  *
+  */
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #include "netconsole.h"
+ 
+ #define MAXLINELEN	256			/* Max length of new pattern */
diff --git a/net/nocol/patches/patch-netconsole_utils_c b/net/nocol/patches/patch-netconsole_utils_c
new file mode 100644
index 00000000000..345f2d41796
--- /dev/null
+++ b/net/nocol/patches/patch-netconsole_utils_c
@@ -0,0 +1,13 @@
+$NetBSD: patch-netconsole_utils_c,v 1.1 2012/09/09 19:35:21 dholland Exp $
+
+Use standard headers.
+
+--- netconsole/utils.c~	2000-01-19 03:51:20.000000000 +0000
++++ netconsole/utils.c
+@@ -16,4 +16,6 @@
+ #endif
+ 
++#include <stdlib.h>
++
+ #include  "netconsole.h"
+ 
diff --git a/net/nocol/patches/patch-noclog_noclogd_c b/net/nocol/patches/patch-noclog_noclogd_c
new file mode 100644
index 00000000000..cc5261c8e0b
--- /dev/null
+++ b/net/nocol/patches/patch-noclog_noclogd_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-noclog_noclogd_c,v 1.1 2012/09/09 19:35:21 dholland Exp $
+
+Use standard headers.
+
+--- noclog/noclogd.c~	1998-07-15 16:28:57.000000000 +0000
++++ noclog/noclogd.c
+@@ -41,6 +41,8 @@
+  *
+  */
+ 
++#include <stdlib.h>
++
+ #include "noclogd.h"
+ 
+ #define READ_TIMEOUT	5    	/* timeout for read() from sockets */
diff --git a/net/nocol/patches/patch-nsmon_main_c b/net/nocol/patches/patch-nsmon_main_c
new file mode 100644
index 00000000000..e4fd489f290
--- /dev/null
+++ b/net/nocol/patches/patch-nsmon_main_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-nsmon_main_c,v 1.1 2012/09/09 19:35:21 dholland Exp $
+
+Use standard headers.
+
+--- nsmon/main.c~	1998-08-28 03:21:12.000000000 +0000
++++ nsmon/main.c
+@@ -82,6 +82,7 @@
+ # include "nsmon.h"			/* program specific defines	*/
+ #undef GLOBALS
+ 
++#include <stdlib.h>
+ #include <string.h>			/* For strcat() definitions	*/
+ #include <sys/file.h>
+ #include <signal.h>			/* For signal numbers		*/
diff --git a/net/nocol/patches/patch-tknocol_ndaemon_c b/net/nocol/patches/patch-tknocol_ndaemon_c
new file mode 100644
index 00000000000..69cf74c1b52
--- /dev/null
+++ b/net/nocol/patches/patch-tknocol_ndaemon_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-tknocol_ndaemon_c,v 1.1 2012/09/09 19:35:21 dholland Exp $
+
+Use standard headers.
+
+--- tknocol/ndaemon.c~	2000-01-27 05:23:42.000000000 +0000
++++ tknocol/ndaemon.c
+@@ -45,6 +45,9 @@
+  *
+  */
+ 
++#include <stdlib.h>
++#include <string.h>
++
+ #include "ndaemon.h"
+ 
+ #ifdef LEASED_LINES		/* Company specific */
diff --git a/net/nocol/patches/patch-utility_display__nocol__datafile_c b/net/nocol/patches/patch-utility_display__nocol__datafile_c
new file mode 100644
index 00000000000..1dab3ca28e5
--- /dev/null
+++ b/net/nocol/patches/patch-utility_display__nocol__datafile_c
@@ -0,0 +1,17 @@
+$NetBSD: patch-utility_display__nocol__datafile_c,v 1.1 2012/09/09 19:35:21 dholland Exp $
+
+Functions returning pointers must be declared before being called.
+(The function in question does not appear to be in any header file
+and it isn't clear which if any it should be added to.)
+
+--- utility/display_nocol_datafile.c~	1994-06-12 17:21:24.000000000 +0000
++++ utility/display_nocol_datafile.c
+@@ -11,6 +11,8 @@
+ #include 	<stdio.h>
+ #include 	<sys/file.h>
+ 
++char *event_to_logstr(EVENT *);
++
+ int	debug;		/* referenced in libnocol.a */
+ char	*prognm;	/* referenced in libnocol.a */
+