From b0b7095861f8b511663bb129ad42366dff929fcf Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 22 Jun 2001 21:43:51 +0000
Subject: [PATCH] Quiet compiler warnings by making `WARNS 2' clean.

Submitted by:	Mike Barcroft <mike@q9media.com>

Set maintainer to myself.  This needs to stay in sync with what Buntils
does, and it would be best to pass functionality changes thru me to make
sure future plans are taken into account.
---
 usr.bin/brandelf/Makefile   |  4 +++-
 usr.bin/brandelf/brandelf.c | 11 ++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/usr.bin/brandelf/Makefile b/usr.bin/brandelf/Makefile
index 87679131e8f..52f72faf0bf 100644
--- a/usr.bin/brandelf/Makefile
+++ b/usr.bin/brandelf/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
+MAINTAINER=	obrien
+
 PROG=	brandelf
-CFLAGS+= -Wall
+WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index e26b900c61f..dbbacc469f8 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -1,4 +1,5 @@
 /*-
+ * Copyright (c) 2000, 2001 David O'Brien
  * Copyright (c) 1996 Søren Schmidt
  * All rights reserved.
  *
@@ -170,14 +171,14 @@ fprintf(stderr, "usage: brandelf [-f ELF ABI number] [-v] [-l] [-t string] file
 }
 
 static const char *
-iselftype(int elftype)
+iselftype(int etype)
 {
-	int elfwalk;
+	size_t elfwalk;
 
 	for (elfwalk = 0;
 	     elfwalk < sizeof(elftypes)/sizeof(elftypes[0]);
 	     elfwalk++)
-		if (elftype == elftypes[elfwalk].value)
+		if (etype == elftypes[elfwalk].value)
 			return elftypes[elfwalk].str;
 	return 0;
 }
@@ -185,7 +186,7 @@ iselftype(int elftype)
 static int
 elftype(const char *elfstrtype)
 {
-	int elfwalk;
+	size_t elfwalk;
 
 	for (elfwalk = 0;
 	     elfwalk < sizeof(elftypes)/sizeof(elftypes[0]);
@@ -198,7 +199,7 @@ elftype(const char *elfstrtype)
 static void
 printelftypes()
 {
-	int elfwalk;
+	size_t elfwalk;
 
 	fprintf(stderr, "known ELF types are: ");
 	for (elfwalk = 0;