diff options
author | delphij <delphij@FreeBSD.org> | 2006-01-23 13:55:32 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2006-01-23 13:55:32 +0000 |
commit | e545650ae6d77ca3ade0d19b8f5b9ca35eae1e84 (patch) | |
tree | 924a183c4f5ee3c5ce4845ac06cd9e8686bca769 /usr.sbin/btxld | |
parent | 8873885f5e9fde0fe1848264ac58a69d86f17f98 (diff) | |
download | FreeBSD-src-e545650ae6d77ca3ade0d19b8f5b9ca35eae1e84.zip FreeBSD-src-e545650ae6d77ca3ade0d19b8f5b9ca35eae1e84.tar.gz |
An old patch from Dan Lukes <dan at obluda.cz>:
+ Include netinet/in.h for ntohl()
* Since the return value was tested separately, cast the values to
size_t in order to shut up compiler warnings.
+ Raise WARNS= level to 6
PR: bin/71666
Diffstat (limited to 'usr.sbin/btxld')
-rw-r--r-- | usr.sbin/btxld/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/btxld/btxld.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile index 32cf99d..6ca452e 100644 --- a/usr.sbin/btxld/Makefile +++ b/usr.sbin/btxld/Makefile @@ -4,4 +4,6 @@ PROG= btxld MAN= btxld.8 SRCS= btxld.c elfh.c +WARNS?= 6 + .include <bsd.prog.mk> diff --git a/usr.sbin/btxld/btxld.c b/usr.sbin/btxld/btxld.c index 7acf842..f255fa5 100644 --- a/usr.sbin/btxld/btxld.c +++ b/usr.sbin/btxld/btxld.c @@ -39,6 +39,8 @@ static const char rcsid[] = #undef __LDPGSZ #define __LDPGSZ 4096 +#include <netinet/in.h> + #include <a.out.h> #include <err.h> #include <errno.h> @@ -250,7 +252,7 @@ btxld(const char *iname) } btx.btx_pgctl -= cwr; btx.btx_entry = Eflag ? centry : ihdr.entry; - if (snprintf(name, sizeof(name), "%s.tmp", oname) >= sizeof(name)) + if ((size_t)snprintf(name, sizeof(name), "%s.tmp", oname) >= sizeof(name)) errx(2, "%s: Filename too long", oname); if ((fdo = open(name, O_CREAT | O_TRUNC | O_WRONLY, 0666)) == -1) err(2, "%s", name); @@ -480,7 +482,7 @@ writex(int fd, const void *buf, size_t nbyte) if ((n = write(fd, buf, nbyte)) == -1) err(2, "%s", tname); - if (n != nbyte) + if ((size_t)n != nbyte) errx(2, "%s: Short write", tname); } |