From a1363b540024269cf815f5fc4fc0c9c849aa3434 Mon Sep 17 00:00:00 2001
From: mortimer <mortimer@cvs.openbsd.org>
Date: Mon, 31 Jul 2017 01:18:10 +0000
Subject: Style fix and unused var/label cleanup. From Matthew Martin. ok
 deraadt@

---
 distrib/common/elfrd_size.c   | 3 +--
 distrib/common/elfrdsetroot.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'distrib')

diff --git a/distrib/common/elfrd_size.c b/distrib/common/elfrd_size.c
index e988ccc3b3c..67d2705ccd3 100644
--- a/distrib/common/elfrd_size.c
+++ b/distrib/common/elfrd_size.c
@@ -24,7 +24,7 @@ int
 ELFNAME(find_rd_root_image)(char *, int, Elf_Phdr *, int, long *, long *,
     off_t *, size_t *);
 int
-ELFNAME(nlist)(int fd, struct nlist *list);
+ELFNAME(nlist)(int, struct nlist *);
 
 struct elf_fn ELFDEFNNAME(fn) =
 {
@@ -371,7 +371,6 @@ ELFNAME(nlist)(int fd, struct nlist *list)
 			}
 		}
 	}
-elf_done:
 	if (usemalloc)
 		free(strtab);
 	else
diff --git a/distrib/common/elfrdsetroot.c b/distrib/common/elfrdsetroot.c
index 9c43cdec8e8..f29f175bef0 100644
--- a/distrib/common/elfrdsetroot.c
+++ b/distrib/common/elfrdsetroot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elfrdsetroot.c,v 1.22 2011/07/08 21:39:32 drahn Exp $	*/
+/*	$OpenBSD: elfrdsetroot.c,v 1.23 2017/07/31 01:18:09 mortimer Exp $	*/
 /*	$NetBSD: rdsetroot.c,v 1.2 1995/10/13 16:38:39 gwr Exp $	*/
 
 /*
@@ -72,7 +72,6 @@ int
 main(int argc, char *argv[])
 {
 	int ch, fd, n, xflag = 0, fsd;
-	int found = 0, phsize;
 	char *fs = NULL;
 	char *file;
 	u_int32_t *ip;
-- 
cgit v1.2.3