aboutsummaryrefslogtreecommitdiff
path: root/sbin/iscontrol
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2020-03-29 02:28:15 +0000
committerKyle Evans <kevans@FreeBSD.org>2020-03-29 02:28:15 +0000
commitb4cd5daf75be81c3fdc9280f8ca3bdf1632510f2 (patch)
treea51991bbd920a298222c847c514531700f83a021 /sbin/iscontrol
parent0690ee732ae01493bc6b5c053808f79c22882a91 (diff)
downloadsrc-b4cd5daf75be81c3fdc9280f8ca3bdf1632510f2.tar.gz
src-b4cd5daf75be81c3fdc9280f8ca3bdf1632510f2.zip
iscontrol: move definition of vflag/iscsidev to iscontrol.c
Mark the declaration extern as these are used elsewhere; this fixes the build with -fno-common. MFC after: 3 days
Notes
Notes: svn path=/head/; revision=359414
Diffstat (limited to 'sbin/iscontrol')
-rw-r--r--sbin/iscontrol/iscontrol.c3
-rw-r--r--sbin/iscontrol/iscontrol.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c
index 967795ba8356..a623d0ca81e3 100644
--- a/sbin/iscontrol/iscontrol.c
+++ b/sbin/iscontrol/iscontrol.c
@@ -82,6 +82,9 @@ token_t DigestMethods[] = {
{0, 0}
};
+int vflag;
+char *iscsidev;
+
u_char isid[6 + 6];
/*
| Default values
diff --git a/sbin/iscontrol/iscontrol.h b/sbin/iscontrol/iscontrol.h
index cc7a6cb772e7..dddb21bb562e 100644
--- a/sbin/iscontrol/iscontrol.h
+++ b/sbin/iscontrol/iscontrol.h
@@ -149,8 +149,8 @@ int recvpdu(isess_t *sess, pdu_t *pp);
int lookup(token_t *tbl, char *m);
-int vflag;
-char *iscsidev;
+extern int vflag;
+extern char *iscsidev;
void parseArgs(int nargs, char **args, isc_opt_t *op);
void parseConfig(FILE *fd, char *key, isc_opt_t *op);