diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-10-19 19:22:33 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-10-19 19:22:33 +0000 |
| commit | bbae3c05c7b342e3d31e819d83a0fdbc5b809ca1 (patch) | |
| tree | 41edbce6c7747baf6e85750a732813688077284c /usr.sbin | |
| parent | bde81837fc8db43ff6ba3a0c1733c58f455f8ce5 (diff) | |
Add parenthesis gcc wants and remove defined but unused label gcc
complains about.
ok deraadt@ on parethesis
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/installboot/i386_nlist.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/installboot/i386_nlist.c b/usr.sbin/installboot/i386_nlist.c index c5a32055f7e..f508d74d94e 100644 --- a/usr.sbin/installboot/i386_nlist.c +++ b/usr.sbin/installboot/i386_nlist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i386_nlist.c,v 1.4 2015/10/16 16:54:38 tobias Exp $ */ +/* $OpenBSD: i386_nlist.c,v 1.5 2015/10/19 19:22:32 krw Exp $ */ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -117,7 +117,7 @@ __elf_fdnlist(int fd, struct nlist *list) /* Make sure it's not too big to mmap */ if (SIZE_MAX - ehdr.e_shoff < shdr_size || - S_ISREG(st.st_mode) && ehdr.e_shoff + shdr_size > st.st_size) { + (S_ISREG(st.st_mode) && ehdr.e_shoff + shdr_size > st.st_size)) { errno = EFBIG; return (-1); } @@ -187,7 +187,7 @@ __elf_fdnlist(int fd, struct nlist *list) /* Check for files too large to mmap. */ if (SIZE_MAX - symstrsize < symstroff || - S_ISREG(st.st_mode) && symstrsize + symstroff > st.st_size) { + (S_ISREG(st.st_mode) && symstrsize + symstroff > st.st_size)) { errno = EFBIG; return (-1); } @@ -288,7 +288,6 @@ __elf_fdnlist(int fd, struct nlist *list) } } } -elf_done: if (usemalloc) free(strtab); else |