enable -Wall, explicitly call _dl_strsep, and zap some redundant includes

ok miod@

8 files changed, 11 insertions, 17 deletions

diff --git a/libexec/ld.so/boot.c b/libexec/ld.so/boot.c
index eecc574d14d..5c2843e5b5f 100644
--- a/libexec/ld.so/boot.c
+++ b/libexec/ld.so/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.1 2014/02/16 01:16:38 martynas Exp $ */
+/*	$OpenBSD: boot.c,v 1.2 2014/07/06 17:33:10 otto Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -40,7 +40,6 @@
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <nlist.h>
-#include <string.h>
 #include <link.h>
 #include <dlfcn.h>
 
diff --git a/libexec/ld.so/dir.c b/libexec/ld.so/dir.c
index 942add5d952..e7408f271cb 100644
--- a/libexec/ld.so/dir.c
+++ b/libexec/ld.so/dir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dir.c,v 1.18 2014/06/21 08:00:22 otto Exp $	*/
+/*	$OpenBSD: dir.c,v 1.19 2014/07/06 17:33:10 otto Exp $	*/
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,6 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "syscall.h"
diff --git a/libexec/ld.so/dl_prebind.c b/libexec/ld.so/dl_prebind.c
index ccd02c2aa24..0c403015226 100644
--- a/libexec/ld.so/dl_prebind.c
+++ b/libexec/ld.so/dl_prebind.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dl_prebind.c,v 1.14 2014/06/21 08:00:22 otto Exp $ */
+/* $OpenBSD: dl_prebind.c,v 1.15 2014/07/06 17:33:10 otto Exp $ */
 /*
  * Copyright (c) 2006 Dale Rahn <drahn@dalerahn.com>
  *
@@ -21,7 +21,6 @@
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <nlist.h>
-#include <string.h>
 #include <link.h>
 #include <dlfcn.h>
 #include <unistd.h>
diff --git a/libexec/ld.so/ldconfig/Makefile b/libexec/ld.so/ldconfig/Makefile
index 4cd40feb2b5..4bce223c723 100644
--- a/libexec/ld.so/ldconfig/Makefile
+++ b/libexec/ld.so/ldconfig/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2013/07/05 21:29:51 miod Exp $
+#	$OpenBSD: Makefile,v 1.11 2014/07/06 17:33:10 otto Exp $
 #	$NetBSD: Makefile,v 1.10 1995/03/06 04:24:41 cgd Exp $
 
 MAN=	ldconfig.8
@@ -8,7 +8,7 @@ MAN=	ldconfig.8
 PROG=	ldconfig
 SRCS=	ldconfig.c shlib.c etc.c prebind_delete.c debug.c prebind.c library.c sod.c prebind_path.c
 LDDIR?= $(.CURDIR)/..
-#CFLAGS+=-Werror
+CFLAGS+=-Wall
 CFLAGS+=-I$(.CURDIR) -I$(.CURDIR)/..
 LDSTATIC=${STATIC}
 BINDIR=	/sbin
diff --git a/libexec/ld.so/ldd/Makefile b/libexec/ld.so/ldd/Makefile
index 4bb2248102f..b28ada07022 100644
--- a/libexec/ld.so/ldd/Makefile
+++ b/libexec/ld.so/ldd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2013/07/05 21:29:51 miod Exp $
+#	$OpenBSD: Makefile,v 1.6 2014/07/06 17:33:10 otto Exp $
 
 MAN=	ldd.1
 
@@ -6,7 +6,7 @@ MAN=	ldd.1
 
 PROG=	ldd
 SRCS=	ldd.c
-#CFLAGS+=-Werror
+CFLAGS+=-Wall
 
 BINDIR=	/usr/bin
 
diff --git a/libexec/ld.so/library_subr.c b/libexec/ld.so/library_subr.c
index 8e8b8fd798c..682ee628b1d 100644
--- a/libexec/ld.so/library_subr.c
+++ b/libexec/ld.so/library_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: library_subr.c,v 1.39 2013/12/03 01:47:05 deraadt Exp $ */
+/*	$OpenBSD: library_subr.c,v 1.40 2014/07/06 17:33:10 otto Exp $ */
 
 /*
  * Copyright (c) 2002 Dale Rahn
@@ -34,7 +34,6 @@
 #include <sys/queue.h>
 #include <limits.h>
 #include <dirent.h>
-#include <string.h>
 
 #include "archdep.h"
 #include "resolve.h"
diff --git a/libexec/ld.so/sod.c b/libexec/ld.so/sod.c
index 4142ce6b5d7..3cd7f983498 100644
--- a/libexec/ld.so/sod.c
+++ b/libexec/ld.so/sod.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sod.c,v 1.28 2014/06/21 08:00:23 otto Exp $	*/
+/*	$OpenBSD: sod.c,v 1.29 2014/07/06 17:33:10 otto Exp $	*/
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -94,7 +94,7 @@ _dl_build_sod(const char *name, struct sod *sodp)
 	major = minor = -1;
 
 	/* loop through name - parse skipping name */
-	for (tuplet = 0; (tok = strsep(&cp, ".")) != NULL; tuplet++) {
+	for (tuplet = 0; (tok = _dl_strsep(&cp, ".")) != NULL; tuplet++) {
 		switch (tuplet) {
 		case 0:
 			/* empty tok, we already skipped to "\.so.*" */
diff --git a/libexec/ld.so/trace.c b/libexec/ld.so/trace.c
index 12f4f63bc64..60d90b974ca 100644
--- a/libexec/ld.so/trace.c
+++ b/libexec/ld.so/trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trace.c,v 1.1 2013/06/01 09:57:55 miod Exp $	*/
+/*	$OpenBSD: trace.c,v 1.2 2014/07/06 17:33:10 otto Exp $	*/
 
 /*
  * Copyright (c) 2013 Miodrag Vallat.
@@ -19,8 +19,6 @@
 #include <sys/types.h>
 #include <sys/param.h>
 
-#include <string.h>
-
 #include "syscall.h"
 #include "resolve.h"
 #include "util.h"