summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authormortimer <mortimer@cvs.openbsd.org>2017-07-31 01:18:10 +0000
committermortimer <mortimer@cvs.openbsd.org>2017-07-31 01:18:10 +0000
commita1363b540024269cf815f5fc4fc0c9c849aa3434 (patch)
tree2d122a611155cf57ace77670405b0b047c23bb0c /distrib
parentd914126a37c567ba9e58a531100f88688e202d68 (diff)
Style fix and unused var/label cleanup. From Matthew Martin.
ok deraadt@
Diffstat (limited to 'distrib')
-rw-r--r--distrib/common/elfrd_size.c3
-rw-r--r--distrib/common/elfrdsetroot.c3
2 files changed, 2 insertions, 4 deletions
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;