fix nested extern and duplicate declarations
This commit is contained in:
parent
3aed6f1e40
commit
422d686664
@ -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 @@ u_char *typemap; /* ptr to inode type table */
|
||||
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 */
|
||||
|
@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1986, 1993\n\
|
||||
#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 argtoi __P((int, char *, char *, int));
|
||||
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 @@ checkfilesys(filesys, mntpt, auxdata, child)
|
||||
static void
|
||||
usage()
|
||||
{
|
||||
extern char *__progname;
|
||||
|
||||
(void) fprintf(stderr,
|
||||
"Usage: %s [-dfnpy] [-b block] [-c level] [-m mode] filesystem ...\n",
|
||||
__progname);
|
||||
|
@ -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 @@ long diskreads, totalreads; /* Disk cache statistics */
|
||||
|
||||
static void rwerror __P((char *, daddr_t));
|
||||
|
||||
extern int returntosingle;
|
||||
|
||||
int
|
||||
ftypeok(dp)
|
||||
struct ext2fs_dinode *dp;
|
||||
@ -474,8 +476,6 @@ void
|
||||
catchquit(n)
|
||||
int n;
|
||||
{
|
||||
extern int returntosingle;
|
||||
|
||||
printf("returning to single-user after filesystem check\n");
|
||||
returntosingle = 1;
|
||||
(void)signal(SIGQUIT, SIG_DFL);
|
||||
|
Loading…
Reference in New Issue
Block a user