From c894b25a2ffcd858ca64d12fc478c4ccbd9b0c81 Mon Sep 17 00:00:00 2001
From: Dima Dorfman <dd@FreeBSD.org>
Date: Thu, 21 Jun 2001 02:10:26 +0000
Subject: Constify mdmaybeload(), add a prototype for usage(), and get rid of a
 sizeof(int) == sizeof(long) assumption; clamp down with WARNS=2.

---
 sbin/mdconfig/Makefile   | 1 +
 sbin/mdconfig/mdconfig.c | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'sbin/mdconfig')

diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index 3abf56b74a8e..e6f2db46aaaa 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=		mdconfig
+WARNS?=		2
 MAN=		mdconfig.8
 MLINKS=		mdconfig.8 vnconfig.8
 
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index 15cbbef58a28..f95223d6a102 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -32,6 +32,7 @@ struct md_ioctl mdio;
 enum {UNSET, ATTACH, DETACH, LIST} action = UNSET;
 
 void mdmaybeload(void);
+void usage(void);
 
 void
 usage()
@@ -200,10 +201,11 @@ int
 list(const int fd)
 {
 	char *disklist, *p, *p2, *p3;
-	int unit, dll;
+	int unit;
+	size_t dll;
 	struct dl *dp, *di, *dn;
 
-	if (sysctlbyname("kern.disks", NULL, &dll, NULL, NULL) == -1)
+	if (sysctlbyname("kern.disks", NULL, &dll, NULL, 0) == -1)
 		err(1, "sysctlbyname: kern.disks");
 	if ( (disklist = malloc(dll)) == NULL)
 		err(1, "malloc");
@@ -280,7 +282,7 @@ mdmaybeload(void)
 {
         struct module_stat mstat;
         int fileid, modid;
-        char *name = "md";
+        const char *name = "md";
 	char *cp;
 
         /* scan files in kernel */
-- 
cgit v1.2.3