Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sbin remove redundant declarations



details:   https://anonhg.NetBSD.org/src/rev/b9533bd1fd43
branches:  trunk
changeset: 503326:b9533bd1fd43
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Feb 04 21:25:54 2001 +0000

description:
remove redundant declarations

diffstat:

 sbin/fsck_ffs/extern.h    |  9 ++-------
 sbin/fsck_ffs/fsck.h      |  4 ++--
 sbin/fsck_ffs/main.c      |  7 +++----
 sbin/fsck_ffs/setup.c     |  6 ++----
 sbin/fsck_ffs/utilities.c |  8 ++++----
 sbin/fsdb/fsdb.c          |  5 ++---
 sbin/fsdb/fsdb.h          |  5 +----
 7 files changed, 16 insertions(+), 28 deletions(-)

diffs (202 lines):

diff -r 60d297448632 -r b9533bd1fd43 sbin/fsck_ffs/extern.h
--- a/sbin/fsck_ffs/extern.h    Sun Feb 04 21:19:34 2001 +0000
+++ b/sbin/fsck_ffs/extern.h    Sun Feb 04 21:25:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.12 2001/01/26 17:37:16 thorpej Exp $      */
+/*     $NetBSD: extern.h,v 1.13 2001/02/04 21:25:54 christos Exp $     */
 
 /*
  * Copyright (c) 1994 James A. Jegers
@@ -53,18 +53,15 @@
 void           freeino __P((ino_t));
 void           freeinodebuf __P((void));
 int            ftypeok __P((struct dinode *));
-int            ftypeok __P((struct dinode *dp));
-void           getblk __P((struct bufarea *bp, ufs_daddr_t blk, long size));
+void           getblk __P((struct bufarea *, ufs_daddr_t, long));
 struct bufarea *getdatablk __P((ufs_daddr_t, long));
 struct inoinfo *getinoinfo __P((ino_t));
-struct dinode  *getnextinode __P((ino_t));
 struct dinode  *ginode __P((ino_t));
 void           getpathname __P((char *, ino_t, ino_t));
 void           inocleanup __P((void));
 void           inodirty __P((void));
 int            linkup __P((ino_t, ino_t));
 int            makeentry __P((ino_t, ino_t, char *));
-void           panic __P((const char *fmt, ...));
 void           pass1 __P((void));
 void           pass1b __P((void));
 int            pass1check __P((struct inodesc *));
@@ -73,10 +70,8 @@
 void           pass4 __P((void));
 int            pass4check __P((struct inodesc *));
 void           pass5 __P((void));
-void           pfatal __P((const char *fmt, ...));
 void           pinode __P((ino_t));
 void           propagate __P((ino_t));
-void           pwarn __P((const char *fmt, ...));
 int            reply __P((char *));
 void           resetinodebuf __P((void));
 int            setup __P((const char *));
diff -r 60d297448632 -r b9533bd1fd43 sbin/fsck_ffs/fsck.h
--- a/sbin/fsck_ffs/fsck.h      Sun Feb 04 21:19:34 2001 +0000
+++ b/sbin/fsck_ffs/fsck.h      Sun Feb 04 21:25:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fsck.h,v 1.23 2001/01/26 17:37:16 thorpej Exp $        */
+/*     $NetBSD: fsck.h,v 1.24 2001/02/04 21:25:54 christos Exp $       */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -211,7 +211,7 @@
 
 extern ino_t   lfdir;          /* lost & found directory inode number */
 extern char    *lfname;        /* lost & found directory name */
-int    lfmode;                 /* lost & found directory creation mode */
+extern int     lfmode;         /* lost & found directory creation mode */
 
 ufs_daddr_t n_blks;            /* number of blocks in use */
 ufs_daddr_t n_files;           /* number of files in use */
diff -r 60d297448632 -r b9533bd1fd43 sbin/fsck_ffs/main.c
--- a/sbin/fsck_ffs/main.c      Sun Feb 04 21:19:34 2001 +0000
+++ b/sbin/fsck_ffs/main.c      Sun Feb 04 21:25:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.36 2001/01/26 17:37:16 thorpej Exp $        */
+/*     $NetBSD: main.c,v 1.37 2001/02/04 21:25:54 christos Exp $       */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.6 (Berkeley) 5/14/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.36 2001/01/26 17:37:16 thorpej Exp $");
+__RCSID("$NetBSD: main.c,v 1.37 2001/02/04 21:25:54 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -79,6 +79,7 @@
 static int     checkfilesys __P((const char *, char *, long, int));
 static  void usage __P((void));
 
+extern char *__progname;
 
 int
 main(argc, argv)
@@ -377,8 +378,6 @@
 static void
 usage()
 {
-       extern char *__progname;
-
        (void) fprintf(stderr,
            "Usage: %s [-dfnpy] [-B be|le] [-b block] [-c level] [-m mode]"
                        "filesystem ...\n",
diff -r 60d297448632 -r b9533bd1fd43 sbin/fsck_ffs/setup.c
--- a/sbin/fsck_ffs/setup.c     Sun Feb 04 21:19:34 2001 +0000
+++ b/sbin/fsck_ffs/setup.c     Sun Feb 04 21:25:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: setup.c,v 1.41 2001/01/26 17:37:16 thorpej Exp $       */
+/*     $NetBSD: setup.c,v 1.42 2001/02/04 21:25:54 christos Exp $      */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c    8.10 (Berkeley) 5/9/95";
 #else
-__RCSID("$NetBSD: setup.c,v 1.41 2001/01/26 17:37:16 thorpej Exp $");
+__RCSID("$NetBSD: setup.c,v 1.42 2001/02/04 21:25:54 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -66,8 +66,6 @@
 #include "extern.h"
 #include "fsutil.h"
 
-struct bufarea asblk;
-struct fs *altsblock;
 #define POWEROF2(num)  (((num) & ((num) - 1)) == 0)
 
 static void badsb __P((int, char *));
diff -r 60d297448632 -r b9533bd1fd43 sbin/fsck_ffs/utilities.c
--- a/sbin/fsck_ffs/utilities.c Sun Feb 04 21:19:34 2001 +0000
+++ b/sbin/fsck_ffs/utilities.c Sun Feb 04 21:25:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: utilities.c,v 1.29 2001/01/09 09:25:32 mycroft Exp $   */
+/*     $NetBSD: utilities.c,v 1.30 2001/02/04 21:25:54 christos Exp $  */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)utilities.c        8.6 (Berkeley) 5/19/95";
 #else
-__RCSID("$NetBSD: utilities.c,v 1.29 2001/01/09 09:25:32 mycroft Exp $");
+__RCSID("$NetBSD: utilities.c,v 1.30 2001/02/04 21:25:54 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -66,6 +66,8 @@
 
 static void rwerror __P((char *, ufs_daddr_t));
 
+extern int returntosingle;
+
 int
 ftypeok(dp)
        struct dinode *dp;
@@ -544,8 +546,6 @@
 catchquit(sig)
        int sig;
 {
-       extern int returntosingle;
-
        printf("returning to single-user after filesystem check\n");
        returntosingle = 1;
        (void)signal(SIGQUIT, SIG_DFL);
diff -r 60d297448632 -r b9533bd1fd43 sbin/fsdb/fsdb.c
--- a/sbin/fsdb/fsdb.c  Sun Feb 04 21:19:34 2001 +0000
+++ b/sbin/fsdb/fsdb.c  Sun Feb 04 21:25:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fsdb.c,v 1.17 2000/10/10 20:24:52 is Exp $     */
+/*     $NetBSD: fsdb.c,v 1.18 2001/02/04 21:29:32 christos Exp $       */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fsdb.c,v 1.17 2000/10/10 20:24:52 is Exp $");
+__RCSID("$NetBSD: fsdb.c,v 1.18 2001/02/04 21:29:32 christos Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -73,7 +73,6 @@
 int main __P((int, char *[]));
 static void usage __P((void));
 static int cmdloop __P((void));
-static int helpfn __P((int, char *[]));
 static char *prompt __P((EditLine *));
 static int scannames __P((struct inodesc *));
 static int dolookup __P((char *));
diff -r 60d297448632 -r b9533bd1fd43 sbin/fsdb/fsdb.h
--- a/sbin/fsdb/fsdb.h  Sun Feb 04 21:19:34 2001 +0000
+++ b/sbin/fsdb/fsdb.h  Sun Feb 04 21:25:54 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fsdb.h,v 1.6 1998/03/18 17:03:15 bouyer Exp $  */
+/*     $NetBSD: fsdb.h,v 1.7 2001/02/04 21:29:32 christos Exp $        */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -36,10 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-extern int bread __P((int fd, char *buf, daddr_t blk, long size));
-extern void bwrite __P((int fd, char *buf, daddr_t blk, long size));
 extern void rwerror __P((char *mesg, daddr_t blk));
-extern int reply __P((char *question));
 
 extern long dev_bsize;
 extern long secsize;



Home | Main Index | Thread Index | Old Index