svn commit: r359414 - head/sbin/iscontrol

Kyle Evans kevans at FreeBSD.org
Sun Mar 29 02:28:22 UTC 2020


Author: kevans
Date: Sun Mar 29 02:28:15 2020
New Revision: 359414
URL: https://svnweb.freebsd.org/changeset/base/359414

Log:
  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

Modified:
  head/sbin/iscontrol/iscontrol.c
  head/sbin/iscontrol/iscontrol.h

Modified: head/sbin/iscontrol/iscontrol.c
==============================================================================
--- head/sbin/iscontrol/iscontrol.c	Sun Mar 29 02:26:58 2020	(r359413)
+++ head/sbin/iscontrol/iscontrol.c	Sun Mar 29 02:28:15 2020	(r359414)
@@ -82,6 +82,9 @@ token_t	DigestMethods[] = {
      {0, 0}
 };
 
+int	vflag;
+char	*iscsidev;
+
 u_char	isid[6 + 6];
 /*
  | Default values

Modified: head/sbin/iscontrol/iscontrol.h
==============================================================================
--- head/sbin/iscontrol/iscontrol.h	Sun Mar 29 02:26:58 2020	(r359413)
+++ head/sbin/iscontrol/iscontrol.h	Sun Mar 29 02:28:15 2020	(r359414)
@@ -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);


More information about the svn-src-all mailing list