[src/trunk]: src/sbin/fsck_ext2fs fix nested extern and duplicate declarations

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/60d297448632
branches:  trunk
changeset: 503325:60d297448632
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Feb 04 21:19:34 2001 +0000

description:
fix nested extern and duplicate declarations

diffstat:

 sbin/fsck_ext2fs/fsck.h      |  6 +++---
 sbin/fsck_ext2fs/main.c      |  7 +++----
 sbin/fsck_ext2fs/utilities.c |  8 ++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diffs (91 lines):

diff -r 447c4e84488a -r 60d297448632 sbin/fsck_ext2fs/fsck.h
--- a/sbin/fsck_ext2fs/fsck.h   Sun Feb 04 21:16:59 2001 +0000
+++ b/sbin/fsck_ext2fs/fsck.h   Sun Feb 04 21:19:34 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fsck.h,v 1.4 2000/01/28 16:01:46 bouyer Exp $  */
+/*     $NetBSD: fsck.h,v 1.5 2001/02/04 21:19:34 christos Exp $        */
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.
@@ -187,8 +187,8 @@
 int16_t        *lncntp;                /* ptr to link count table */
 
 ino_t  lfdir;                  /* lost & found directory inode number */
-char   *lfname;                /* lost & found directory name */
-int    lfmode;                 /* lost & found directory creation mode */
+extern char    *lfname;        /* lost & found directory name */
+extern int     lfmode;         /* lost & found directory creation mode */
 
 daddr_t        n_blks;                 /* number of blocks in use */
 daddr_t        n_files;                /* number of files in use */
diff -r 447c4e84488a -r 60d297448632 sbin/fsck_ext2fs/main.c
--- a/sbin/fsck_ext2fs/main.c   Sun Feb 04 21:16:59 2001 +0000
+++ b/sbin/fsck_ext2fs/main.c   Sun Feb 04 21:19:34 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.8 2000/01/28 16:01:46 bouyer Exp $  */
+/*     $NetBSD: main.c,v 1.9 2001/02/04 21:19:34 christos Exp $        */
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.2 (Berkeley) 1/23/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.8 2000/01/28 16:01:46 bouyer Exp $");
+__RCSID("$NetBSD: main.c,v 1.9 2001/02/04 21:19:34 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -74,6 +74,7 @@
 static int     checkfilesys __P((const char *, char *, long, int));
 static  void usage __P((void));
 
+extern char *__progname;
 
 int
 main(argc, argv)
@@ -325,8 +326,6 @@
 static void
 usage()
 {
-       extern char *__progname;
-
        (void) fprintf(stderr,
            "Usage: %s [-dfnpy] [-b block] [-c level] [-m mode] filesystem ...\n",
            __progname);
diff -r 447c4e84488a -r 60d297448632 sbin/fsck_ext2fs/utilities.c
--- a/sbin/fsck_ext2fs/utilities.c      Sun Feb 04 21:16:59 2001 +0000
+++ b/sbin/fsck_ext2fs/utilities.c      Sun Feb 04 21:19:34 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: utilities.c,v 1.5 2000/10/10 20:24:51 is Exp $ */
+/*     $NetBSD: utilities.c,v 1.6 2001/02/04 21:19:34 christos Exp $   */
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)utilities.c        8.1 (Berkeley) 6/5/93";
 #else
-__RCSID("$NetBSD: utilities.c,v 1.5 2000/10/10 20:24:51 is Exp $");
+__RCSID("$NetBSD: utilities.c,v 1.6 2001/02/04 21:19:34 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -63,6 +63,8 @@
 
 static void rwerror __P((char *, daddr_t));
 
+extern int returntosingle;
+
 int
 ftypeok(dp)
        struct ext2fs_dinode *dp;
@@ -474,8 +476,6 @@
 catchquit(n)
        int n;
 {
-       extern int returntosingle;
-
        printf("returning to single-user after filesystem check\n");
        returntosingle = 1;
        (void)signal(SIGQUIT, SIG_DFL);