From f4455c7ee2148a5d723b03c9b95716908a37fa48 Mon Sep 17 00:00:00 2001
From: delphij <delphij@FreeBSD.org>
Date: Mon, 17 Jan 2005 13:56:46 +0000
Subject: WARNS=6 cleanup:

 - signed/unsigned conform.
 - Better initialization of nlist[].  I think we should have
   something like NLIST_NULL instead of the current (ugly)
   form...
---
 sbin/dmesg/Makefile |  3 +++
 sbin/dmesg/dmesg.c  | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'sbin/dmesg')

diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile
index 7779563..8472f56 100644
--- a/sbin/dmesg/Makefile
+++ b/sbin/dmesg/Makefile
@@ -3,6 +3,9 @@
 
 PROG=	dmesg
 MAN=	dmesg.8
+
+WARNS?=	6
+
 LDADD=	-lkvm
 DPADD=	${LIBKVM}
 
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index c0f4b5a..d1f7ef5 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -59,10 +59,12 @@ __FBSDID("$FreeBSD$");
 #include <vis.h>
 #include <sys/syslog.h>
 
+char s_msgbufp[] = "_msgbufp";
+
 struct nlist nl[] = {
 #define	X_MSGBUF	0
-	{ "_msgbufp" },
-	{ NULL },
+	{ s_msgbufp, 0, 0, 0, 0 },
+	{ NULL, 0, 0, 0, 0 },
 };
 
 void usage(void) __dead2;
@@ -134,10 +136,10 @@ main(int argc, char *argv[])
 		/* Unwrap the circular buffer to start from the oldest data. */
 		bufpos = MSGBUF_SEQ_TO_POS(&cur, cur.msg_wseq);
 		if (kvm_read(kd, (long)&cur.msg_ptr[bufpos], bp,
-		    cur.msg_size - bufpos) != cur.msg_size - bufpos)
+		    cur.msg_size - bufpos) != (ssize_t)(cur.msg_size - bufpos))
 			errx(1, "kvm_read: %s", kvm_geterr(kd));
 		if (bufpos != 0 && kvm_read(kd, (long)cur.msg_ptr,
-		    &bp[cur.msg_size - bufpos], bufpos) != bufpos)
+		    &bp[cur.msg_size - bufpos], bufpos) != (ssize_t)bufpos)
 			errx(1, "kvm_read: %s", kvm_geterr(kd));
 		kvm_close(kd);
 		buflen = cur.msg_size;
-- 
cgit v1.1