summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2004-01-11 19:25:56 +0000
committerphk <phk@FreeBSD.org>2004-01-11 19:25:56 +0000
commitacdc44bfa7126d7b228a5d4e734c13417fa3e84c (patch)
tree26052959c22ba51bf44e762f1f6deb6e6b5dba1d
parent7c9c2b48f70c1e776f521458d075370e5d452838 (diff)
downloadFreeBSD-src-acdc44bfa7126d7b228a5d4e734c13417fa3e84c.zip
FreeBSD-src-acdc44bfa7126d7b228a5d4e734c13417fa3e84c.tar.gz
collect all "extern bla" stuff in extern.h in order to get cross-file
type checking. No bugs found.
-rw-r--r--usr.sbin/mtree/compare.c3
-rw-r--r--usr.sbin/mtree/create.c6
-rw-r--r--usr.sbin/mtree/extern.h8
-rw-r--r--usr.sbin/mtree/misc.c2
-rw-r--r--usr.sbin/mtree/verify.c5
5 files changed, 8 insertions, 16 deletions
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 5b621f0..bf4353c 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -61,9 +61,6 @@ __FBSDID("$FreeBSD$");
#include "mtree.h"
#include "extern.h"
-extern int uflag;
-extern int lineno;
-
#define INDENTNAMELEN 8
#define LABEL \
if (!label++) { \
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index 22f20bc..04e9a2b 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -64,12 +64,6 @@ __FBSDID("$FreeBSD$");
#define INDENTNAMELEN 15
#define MAXLINELEN 80
-extern int ftsoptions;
-extern int dflag, iflag, nflag, sflag;
-extern u_int keys;
-extern char fullpath[MAXPATHLEN];
-extern int lineno;
-
static gid_t gid;
static uid_t uid;
static mode_t mode;
diff --git a/usr.sbin/mtree/extern.h b/usr.sbin/mtree/extern.h
index 8670bb1..5f92344 100644
--- a/usr.sbin/mtree/extern.h
+++ b/usr.sbin/mtree/extern.h
@@ -49,3 +49,11 @@ int check_excludes(const char *, const char *);
void init_excludes(void);
void read_excludes_file(const char *);
const char * ftype(u_int type);
+
+extern int ftsoptions;
+extern u_int keys;
+extern int lineno;
+extern int dflag, eflag, iflag, nflag, qflag, rflag, sflag, uflag;
+#ifdef MAXPATHLEN
+extern char fullpath[MAXPATHLEN];
+#endif
diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c
index b970328..cc211f0 100644
--- a/usr.sbin/mtree/misc.c
+++ b/usr.sbin/mtree/misc.c
@@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$");
#include "mtree.h"
#include "extern.h"
-extern int lineno;
-
typedef struct _key {
const char *name; /* key name */
u_int val; /* value */
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index 3f697f6..7f2cf8db 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -47,11 +47,6 @@ __FBSDID("$FreeBSD$");
#include "mtree.h"
#include "extern.h"
-extern int ftsoptions;
-extern int dflag, eflag, qflag, rflag, sflag, uflag;
-extern char fullpath[MAXPATHLEN];
-extern int lineno;
-
static NODE *root;
static char path[MAXPATHLEN];
OpenPOWER on IntegriCloud