Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

3 files changed, 21 insertions, 21 deletions

diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
index f0b56ef022b..dedd22da1fc 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netgroup_mkdb.c,v 1.8 2000/06/30 16:00:26 millert Exp $	*/
+/*	$OpenBSD: netgroup_mkdb.c,v 1.9 2002/02/16 21:28:06 millert Exp $	*/
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 #ifndef lint
-static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.8 2000/06/30 16:00:26 millert Exp $";
+static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.9 2002/02/16 21:28:06 millert Exp $";
 #endif
 
 #include <sys/types.h>
@@ -70,23 +70,23 @@ struct nentry {
 };
 
 
-static DB       *ng_insert __P((DB *, const char *));
+static DB       *ng_insert(DB *, const char *);
 static void	 ng_reventry __P((DB *, DB *, struct nentry *, char *,
 				  size_t, struct stringlist *));
 
-static void	 ng_print __P((struct nentry *, struct string *));
-static void	 ng_rprint __P((DB *, struct string *));
-static DB	*ng_reverse __P((DB *, size_t));
-static DB	*ng_load __P((const char *));
-static void	 ng_write __P((DB *, DB *, int));
-static void	 ng_rwrite __P((DB *, DB *, int));
-static void	 usage __P((void));
-static void	 cleanup __P((void));
+static void	 ng_print(struct nentry *, struct string *);
+static void	 ng_rprint(DB *, struct string *);
+static DB	*ng_reverse(DB *, size_t);
+static DB	*ng_load(const char *);
+static void	 ng_write(DB *, DB *, int);
+static void	 ng_rwrite(DB *, DB *, int);
+static void	 usage(void);
+static void	 cleanup(void);
 
 #ifdef DEBUG_NG
 static int 	 debug = 0;
-static void	 ng_dump __P((DB *));
-static void	 ng_rdump __P((DB *));
+static void	 ng_dump(DB *);
+static void	 ng_rdump(DB *);
 #endif /* DEBUG_NG */
 
 
diff --git a/usr.sbin/netgroup_mkdb/str.h b/usr.sbin/netgroup_mkdb/str.h
index da5fd9a6713..6906ac5ed51 100644
--- a/usr.sbin/netgroup_mkdb/str.h
+++ b/usr.sbin/netgroup_mkdb/str.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: str.h,v 1.1 1995/10/18 08:47:57 deraadt Exp $
+ * $Id: str.h,v 1.2 2002/02/16 21:28:06 millert Exp $
  */
 
 #include <sys/types.h>
@@ -40,8 +40,8 @@ struct string {
 };
 
 __BEGIN_DECLS
-void str_init		__P((struct string *));
-void str_append		__P((struct string *, const char *, int));
-void str_prepend	__P((struct string *, const char *, int));
-void str_free		__P((struct string *));
+void str_init(struct string *);
+void str_append(struct string *, const char *, int);
+void str_prepend(struct string *, const char *, int);
+void str_free(struct string *);
 __END_DECLS
diff --git a/usr.sbin/netgroup_mkdb/util.h b/usr.sbin/netgroup_mkdb/util.h
index a9773fa2cb5..84523a4f422 100644
--- a/usr.sbin/netgroup_mkdb/util.h
+++ b/usr.sbin/netgroup_mkdb/util.h
@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-void *emalloc	__P((size_t));
-void *erealloc	__P((void *, size_t));
-char *getline	__P((FILE *, size_t *));
+void *emalloc(size_t);
+void *erealloc(void *, size_t);
+char *getline(FILE *, size_t *);
 __END_DECLS