From: Sascha Wildner <saw@online.de>
Date: Tue, 16 Oct 2012 02:51:22 +0000 (+0200)
Subject: brandelf(1): Make -v a no-op.
X-Git-Tag: v3.4.0rc~991^2~41
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/95890903e65a7e9e519723acaa0e93980f608f17

brandelf(1): Make -v a no-op.

-v never did anything, so remove the verbose variable and comment it out
in the manpage, but leave the option for compatibility.

Found-by: gcc47
---

diff --git a/usr.bin/brandelf/brandelf.1 b/usr.bin/brandelf/brandelf.1
index 67b5c9d778..1ba7ad43d4 100644
--- a/usr.bin/brandelf/brandelf.1
+++ b/usr.bin/brandelf/brandelf.1
@@ -26,7 +26,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.bin/brandelf/brandelf.1,v 1.17 2007/03/09 14:36:18 ru Exp $
-.\" $DragonFly: src/usr.bin/brandelf/brandelf.1,v 1.6 2007/09/22 20:50:26 pavalos Exp $
 .\"
 .Dd February 6, 1997
 .Dt BRANDELF 1
@@ -36,7 +35,7 @@
 .Nd mark an ELF binary for a specific ABI
 .Sh SYNOPSIS
 .Nm
-.Op Fl lv
+.Op Fl l
 .Op Fl f Ar ELF_ABI_number
 .Op Fl t Ar string
 .Ar
@@ -56,8 +55,6 @@ option.
 These values are assigned by SCO/USL.
 .It Fl l
 Writes the list of all known ELF types to the standard error.
-.It Fl v
-Turns on verbose output.
 .It Fl t Ar string
 Brands the given ELF binaries to be of the
 .Ar string
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index 90e55b2e70..75ac3d5ba7 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -27,7 +27,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.bin/brandelf/brandelf.c,v 1.25 2005/05/21 09:55:04 ru Exp $
- * $DragonFly: src/usr.bin/brandelf/brandelf.c,v 1.4 2007/09/22 20:40:06 pavalos Exp $
  */
 
 #include <sys/types.h>
@@ -65,7 +64,6 @@ main(int argc, char **argv)
 	int type = ELFOSABI_FREEBSD;
 	int retval = 0;
 	int ch, change = 0, force = 0, listed = 0;
-	int __unused verbose = 0;
 
 	while ((ch = getopt(argc, argv, "f:lt:v")) != -1)
 		switch (ch) {
@@ -85,7 +83,7 @@ main(int argc, char **argv)
 			listed = 1;
 			break;
 		case 'v':
-			verbose = 1;
+			/* does nothing */
 			break;
 		case 't':
 			if (force)