From: Sascha Wildner <saw@online.de>
Date: Sat, 27 Jun 2020 13:29:23 +0000 (+0200)
Subject: camcontrol(8): Fix building with -fno-common.
X-Git-Tag: v6.0.0rc1~977
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/052dfce064bfc7948f297336a4ea6c0f72eebd0a?ds=sidebyside

camcontrol(8): Fix building with -fno-common.

-fno-common will be default in future compilers (GCC 10, for example).
---

diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index a0d3c268f9..99c496df01 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -3716,9 +3716,9 @@ bailout:
 #endif /* MINIMALISTIC */
 
 void 
-usage(int verbose)
+usage(int _verbose)
 {
-	fprintf(verbose ? stdout : stderr,
+	fprintf(_verbose ? stdout : stderr,
 "usage:  camcontrol <command>  [device id][generic args][command args]\n"
 "        camcontrol devlist    [-b][-v]\n"
 #ifndef MINIMALISTIC
@@ -3751,7 +3751,7 @@ usage(int verbose)
 "        camcontrol format     [dev_id][generic args][-q][-r][-w][-y]\n"
 #endif /* MINIMALISTIC */
 "        camcontrol help\n");
-	if (!verbose)
+	if (!_verbose)
 		return;
 #ifndef MINIMALISTIC
 	fprintf(stdout,
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index 9437971dbb..0e1b92aca5 100644
--- a/sbin/camcontrol/camcontrol.h
+++ b/sbin/camcontrol/camcontrol.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/camcontrol/camcontrol.h,v 1.3.2.1 2000/08/14 05:42:32 kbyanc Exp $
- * $DragonFly: src/sbin/camcontrol/camcontrol.h,v 1.3 2005/01/11 23:58:55 cpressey Exp $
  */
 
 #ifndef _CAMCONTROL_H
@@ -41,6 +40,8 @@ struct get_hook
 	int got;
 };
 
+extern int verbose;
+
 void	 mode_sense(struct cam_device *, int, int, int, int, int, u_int8_t *,
 		    int);
 void	 mode_select(struct cam_device *, int, int, int, u_int8_t *, int);
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index 8004b7a8a9..b0d4b16a1d 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -47,8 +47,6 @@
 #include <camlib.h>
 #include "camcontrol.h"
 
-int verbose = 0;
-
 #define	DEFAULT_SCSI_MODE_DB	"/usr/share/misc/scsi_modes"
 #define	DEFAULT_EDITOR		"vi"
 #define	MAX_FORMAT_SPEC		4096	/* Max CDB format specifier. */