From 4056c9f72dea24dcbe62a88e309f88b6cc7dfb29 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sun, 4 Feb 2001 22:04:11 +0000
Subject: [PATCH] fix redundant declarations.

---
 libexec/ftpd/extern.h  | 6 +++++-
 libexec/ftpd/ftpd.c    | 5 ++---
 libexec/ftpd/logwtmp.c | 5 +++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index 7cc3fa12c0bd..53abd2504816 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.37 2000/12/18 02:32:51 lukem Exp $	*/
+/*	$NetBSD: extern.h,v 1.38 2001/02/04 22:04:11 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -140,7 +140,9 @@ char   *getline(char *, int, FILE *);
 void	init_curclass(void);
 void	logxfer(const char *, off_t, const char *, const char *,
 	    const struct timeval *, const char *);
+#if 0
 void	logwtmp(const char *, const char *, const char *);
+#endif
 struct tab *lookup(struct tab *, const char *);
 void	makedir(const char *);
 void	mlsd(const char *);
@@ -269,7 +271,9 @@ struct ftpclass {
 	mode_t		 umask;		/* Umask to use */
 };
 
+#ifndef YYEMPTY
 extern  int		yyparse(void);
+#endif
 
 #ifndef	GLOBAL
 #define	GLOBAL	extern
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 53a41a35a22c..301fee1efde6 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftpd.c,v 1.120 2001/01/16 02:50:29 cgd Exp $	*/
+/*	$NetBSD: ftpd.c,v 1.121 2001/02/04 22:04:12 christos Exp $	*/
 
 /*
  * Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
@@ -109,7 +109,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)ftpd.c	8.5 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: ftpd.c,v 1.120 2001/01/16 02:50:29 cgd Exp $");
+__RCSID("$NetBSD: ftpd.c,v 1.121 2001/02/04 22:04:12 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -169,7 +169,6 @@ __RCSID("$NetBSD: ftpd.c,v 1.120 2001/01/16 02:50:29 cgd Exp $");
 
 int	data;
 jmp_buf	urgcatch;
-struct	passwd *pw;
 int	sflag;
 int	stru;			/* avoid C keyword */
 int	mode;
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 1d9c95b1c471..bee33babb29b 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: logwtmp.c,v 1.15 2000/05/20 02:20:19 lukem Exp $	*/
+/*	$NetBSD: logwtmp.c,v 1.16 2001/02/04 22:04:12 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -40,7 +40,7 @@
 #if 0
 static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: logwtmp.c,v 1.15 2000/05/20 02:20:19 lukem Exp $");
+__RCSID("$NetBSD: logwtmp.c,v 1.16 2001/02/04 22:04:12 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -57,6 +57,7 @@ __RCSID("$NetBSD: logwtmp.c,v 1.15 2000/05/20 02:20:19 lukem Exp $");
 #include <time.h>
 #include <unistd.h>
 #include <utmp.h>
+#include <util.h>
 
 #ifdef KERBEROS5
 #include <krb5/krb5.h>