Use void for a few functions that need it.

6 files changed, 96 insertions, 15 deletions

diff --git a/security/cfs/distinfo b/security/cfs/distinfo
index 635c4cf559f..a298f22c8f2 100644
--- a/security/cfs/distinfo
+++ b/security/cfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2008/06/20 01:09:33 joerg Exp $
+$NetBSD: distinfo,v 1.13 2012/10/26 20:24:19 joerg Exp $
 
 SHA1 (cfs-1.4.1.tar.gz) = be3f73b233149477b739456498c71b120d5f2fb5
 RMD160 (cfs-1.4.1.tar.gz) = 0ced92fe9773c6ce6b6706e26de9e17e710e7e46
@@ -7,7 +7,9 @@ SHA1 (patch-aa) = 7df79a1e84c0866edc11496a4b2cd438ed725936
 SHA1 (patch-ab) = 1ff2d2e32b87332ec66cc8f01299fa4b1ddac81a
 SHA1 (patch-ac) = 354290ff606fab97b73980e6e512f10ef1397f01
 SHA1 (patch-ad) = 2ed5967d59d8f91948b2dd9ed4b18c5073d63615
-SHA1 (patch-ae) = 68b440cda27353d1035bae3002a83d8131087a24
-SHA1 (patch-af) = 19bbedcf0c37356dab747087c64617608ff91838
+SHA1 (patch-ae) = 57fd63e8def95b809ed1ac6ba98567fc1def4150
+SHA1 (patch-af) = 9cc2e69c45c1653843b116207e598d821ec7d8e9
 SHA1 (patch-ag) = 3c0236d65fbf01d68c590fcecc264ac269e66a7a
-SHA1 (patch-ah) = 8e1e92edf2e16e0c6a9c31e6c102f76129305b60
+SHA1 (patch-ah) = 5a57ca471dae4e05895cf6995d7d2c2617fd44ab
+SHA1 (patch-cfs.c) = 5cb7cda91f2838668e4e8e0fe40d835bc3ec9982
+SHA1 (patch-cfs__cipher.c) = cdf80e8657dc346e04968ce2731491e2a9f84785
diff --git a/security/cfs/patches/patch-ae b/security/cfs/patches/patch-ae
index 79aec8194e3..fabf27091bb 100644
--- a/security/cfs/patches/patch-ae
+++ b/security/cfs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2001/06/09 04:32:14 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2012/10/26 20:24:19 joerg Exp $
 
---- cfs_adm.c.orig	Mon Dec 25 01:41:30 1995
-+++ cfs_adm.c	Fri Jun  8 21:14:35 2001
-@@ -43,7 +43,7 @@
+--- cfs_adm.c.orig	2012-10-26 13:15:56.000000000 +0000
++++ cfs_adm.c
+@@ -43,7 +43,7 @@ admproc_null_2()
  cfsstat *
  admproc_attach_2(ap,rp)
       cfs_attachargs *ap;
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.1 2001/06/09 04:32:14 jlam Exp $
  {
  	static cfsstat ret;
  	int i;
-@@ -156,7 +156,7 @@
+@@ -156,7 +156,7 @@ genmasks(k)
  cfsstat *
  admproc_detach_2(ap,rp)
       cfs_detachargs *ap;
@@ -20,3 +20,23 @@ $NetBSD: patch-ae,v 1.1 2001/06/09 04:32:14 jlam Exp $
  {
  	static cfsstat ret;
  	int i;
+@@ -180,8 +180,7 @@ found:
+ }
+ 
+ /* freeinstance is also called by geth if expired */
+-freeinstance(i)
+-    int i;
++void freeinstance(int i)
+ {
+ 	int j;
+ 
+@@ -200,8 +199,7 @@ freeinstance(i)
+ 	closeall();
+ }
+ 
+-freelist(f)
+-    cfs_fileid *f;
++void freelist(cfs_fileid *f)
+ {
+ 	if (f==NULL)
+ 		return;
diff --git a/security/cfs/patches/patch-af b/security/cfs/patches/patch-af
index 987d47ab238..fe33b547b8c 100644
--- a/security/cfs/patches/patch-af
+++ b/security/cfs/patches/patch-af
@@ -1,11 +1,24 @@
-$NetBSD: patch-af,v 1.1 2001/06/09 04:32:14 jlam Exp $
+$NetBSD: patch-af,v 1.2 2012/10/26 20:24:19 joerg Exp $
 
---- cfs.h.orig	Wed Dec  3 13:31:31 1997
-+++ cfs.h	Fri Jun  8 21:13:28 2001
-@@ -224,4 +224,5 @@
+--- cfs.h.orig	2012-10-26 13:15:56.000000000 +0000
++++ cfs.h
+@@ -183,6 +183,11 @@ extern instance *instances[];
+ extern nfstime roottime;
+ extern cfs_fileid rootnode;
+ 
++void closeall(void);
++void freeinstance(int i);
++void freelist(cfs_fileid *f);
++void mask_cipher(cfskey *k, unsigned char *s, int d);
++
+ #ifdef hpux
+ #define seteuid(x) setresuid(-1,x,-1)
+ #define setegid(x) setresgid(-1,x,-1)
+@@ -224,4 +229,6 @@ extern cfs_fileid rootnode;
  #define d_fileno d_ino
  */
  #endif
 -#include<stdlib.h>
 +#include <stdlib.h>
 +#include <string.h>
++#include <unistd.h>
diff --git a/security/cfs/patches/patch-ah b/security/cfs/patches/patch-ah
index 34ed87cd854..b779c1b47eb 100644
--- a/security/cfs/patches/patch-ah
+++ b/security/cfs/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2006/08/05 13:30:26 adrianp Exp $
+$NetBSD: patch-ah,v 1.3 2012/10/26 20:24:19 joerg Exp $
 
---- cfs_fh.c.orig	2006-08-05 14:21:22.000000000 +0100
+--- cfs_fh.c.orig	2012-10-26 13:15:56.000000000 +0000
 +++ cfs_fh.c
 @@ -289,7 +289,7 @@ doencrypt(k,s,l,salt,vect)
       cfskey *k;
@@ -30,3 +30,12 @@ $NetBSD: patch-ah,v 1.2 2006/08/05 13:30:26 adrianp Exp $
  	/* Phil Karn's hack for R/O file systems */
  	if ((fd=open(f->name,mode,0))<0 && errno == EROFS) {
  		mode = CFS_READ;        /* Force read and try again */
+@@ -618,7 +620,7 @@ closeout(f)
+ 	}
+ }
+ 
+-closeall()
++void closeall(void)
+ {
+ 	if (openfd!=NULL) {
+ 		if (curfd>=0)
diff --git a/security/cfs/patches/patch-cfs.c b/security/cfs/patches/patch-cfs.c
new file mode 100644
index 00000000000..cb20357adcc
--- /dev/null
+++ b/security/cfs/patches/patch-cfs.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-cfs.c,v 1.1 2012/10/26 20:24:19 joerg Exp $
+
+--- cfs.c.orig	2012-10-26 13:19:27.000000000 +0000
++++ cfs.c
+@@ -42,6 +42,7 @@
+ #include "cfs.h"
+ 
+ struct in_addr validhost;
++static void initstuff(void);
+ 
+ #if defined(SOLARIS2X) || defined(__NetBSD__)
+ void nfs_program_2();
+@@ -227,7 +228,7 @@ main(argc,argv)
+ 	exit(1);
+ }
+ 
+-initstuff()
++static void initstuff(void)
+ {
+ 	int i;
+ 	static instance ina,inb;
diff --git a/security/cfs/patches/patch-cfs__cipher.c b/security/cfs/patches/patch-cfs__cipher.c
new file mode 100644
index 00000000000..1cd80789157
--- /dev/null
+++ b/security/cfs/patches/patch-cfs__cipher.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-cfs__cipher.c,v 1.1 2012/10/26 20:24:19 joerg Exp $
+
+--- cfs_cipher.c.orig	2012-10-26 03:56:31.000000000 +0000
++++ cfs_cipher.c
+@@ -70,10 +70,7 @@ cipher(k,s,d)
+ 	}
+ }
+ 
+-mask_cipher(k,s,d)
+-     cfskey *k;
+-     unsigned char *s;
+-     int d;
++void mask_cipher(cfskey *k, unsigned char *s, int d)
+ {
+ 	d=d&1;
+ 	switch (k->cipher) {