diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-07-12 05:17:34 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-07-12 05:17:34 +0000 |
| commit | 937c9a0f84db15a0a64ed0419a42da3a34d96cde (patch) | |
| tree | b6b3bfb6f6bbc506426154fc8294316054abb45f /usr.bin/elf2olf/elf2olf.c | |
| parent | 4e5dd980fd1238d635621b9bba7d99533aababd6 (diff) | |
first pass at a -Wall cleanup
Diffstat (limited to 'usr.bin/elf2olf/elf2olf.c')
| -rw-r--r-- | usr.bin/elf2olf/elf2olf.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/usr.bin/elf2olf/elf2olf.c b/usr.bin/elf2olf/elf2olf.c index af8c1931c64..4adc68ae0a7 100644 --- a/usr.bin/elf2olf/elf2olf.c +++ b/usr.bin/elf2olf/elf2olf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elf2olf.c,v 1.4 1997/01/15 23:42:46 millert Exp $ */ +/* $OpenBSD: elf2olf.c,v 1.5 2001/07/12 05:17:01 deraadt Exp $ */ /* * Copyright (c) 1996 Erik Theisen. All rights reserved. * @@ -30,7 +30,7 @@ static char copyright[] = #endif /* not lint */ #ifndef lint -static char rcsid[] = "@(#) $Id: elf2olf.c,v 1.4 1997/01/15 23:42:46 millert Exp $"; +static char rcsid[] = "@(#) $Id: elf2olf.c,v 1.5 2001/07/12 05:17:01 deraadt Exp $"; #endif #include <stdlib.h> @@ -59,6 +59,9 @@ char *os_namev[] = ONAMEV; #define word(x,y)((y == ELFDATA2LSB) ? ntohl(htonl(x)) : ntohl(x)) #define half(x,y)((y == ELFDATA2LSB) ? ntohs(htons(x)) : ntohs(x)) +void usage(void); +void pwarn(char *, char *, int); + int main(int argc, char*argv[]) { @@ -73,7 +76,7 @@ main(int argc, char*argv[]) Elf32_Shdr shdr; int e; - if (progname = strrchr(*argv, '/')) + if ((progname = strrchr(*argv, '/'))) ++progname; else progname = *argv; @@ -163,14 +166,14 @@ main(int argc, char*argv[]) else if (word(shdr.sh_type, e) == SHT_DYNAMIC) ehdr.e_ident[OI_DYNAMIC] = ODYNAMIC; } else - warn(progname, *argv, errno); + pwarn(progname, *argv, errno); } /* while less than number of section headers */ /* We're ready to modify */ okay = 1; } else /* Bogus section header table seek */ - warn(progname, *argv, errno); + pwarn(progname, *argv, errno); } else { /* olf2elf */ ehdr.e_ident[EI_MAG0] = ELFMAG0; @@ -184,7 +187,7 @@ main(int argc, char*argv[]) okay = 1; } /* olf2elf */ } else /* Bogus non-ELF file encountered */ - warn(progname, *argv, ENOEXEC); + pwarn(progname, *argv, ENOEXEC); /* * Do It. @@ -207,22 +210,23 @@ main(int argc, char*argv[]) printf("OLF %s => ELF.\n", *argv); } } else /* bad write */ - warn(progname, *argv, errno); + pwarn(progname, *argv, errno); } else /* bad seek */ - warn(progname, *argv, errno); + pwarn(progname, *argv, errno); } /* okay? */ fsync(fd); close(fd); } else /* couldn't handle file */ - warn(progname, *argv, errno); + pwarn(progname, *argv, errno); } while (*(++argv) != NULL); return (retval); } -warn(name, fname, errval) +void +pwarn(name, fname, errval) char *name; char *fname; int errval; @@ -231,6 +235,7 @@ warn(name, fname, errval) retval = 1; } +void usage() { register int i; |