From 9e5aeba51b431256adfd18b087ee61b09bfd6a79 Mon Sep 17 00:00:00 2001
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Wed, 24 Mar 2021 10:51:25 +0300
Subject: [PATCH] Fix warning about signed comparison and drop WARNS for
 ktrdump(8).

Reviewed By:		jhb, imp
MFC after:		1 week
Differential Revision:	https://reviews.freebsd.org/D29381
---
 usr.bin/ktrdump/Makefile  |  2 --
 usr.bin/ktrdump/ktrdump.c | 14 +++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/usr.bin/ktrdump/Makefile b/usr.bin/ktrdump/Makefile
index 63cd2cf2cea9..796569977f0f 100644
--- a/usr.bin/ktrdump/Makefile
+++ b/usr.bin/ktrdump/Makefile
@@ -4,6 +4,4 @@ PROG=	ktrdump
 LIBADD=	kvm
 MAN=	ktrdump.8
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c
index 750f138f5485..bbe8fb19aae9 100644
--- a/usr.bin/ktrdump/ktrdump.c
+++ b/usr.bin/ktrdump/ktrdump.c
@@ -56,11 +56,11 @@ __FBSDID("$FreeBSD$");
 static void usage(void);
 
 static struct nlist nl[] = {
-	{ "_ktr_version" },
-	{ "_ktr_entries" },
-	{ "_ktr_idx" },
-	{ "_ktr_buf" },
-	{ NULL }
+	{ .n_name = "_ktr_version" },
+	{ .n_name = "_ktr_entries" },
+	{ .n_name = "_ktr_idx" },
+	{ .n_name = "_ktr_buf" },
+	{ .n_name = NULL }
 };
 
 static int cflag;
@@ -262,7 +262,7 @@ main(int ac, char **av)
 		fprintf(out, "\n");
 	}
 
-	tlast = -1;
+	tlast = UINTPTR_MAX;
 	/*
 	 * Now tear through the trace buffer.
 	 *
@@ -327,7 +327,7 @@ next:			if ((c = *p++) == '\0')
 		if (tflag) {
 			tnow = (uintmax_t)buf[i].ktr_timestamp;
 			if (rflag) {
-				if (tlast == -1)
+				if (tlast == UINTPTR_MAX)
 					tlast = tnow;
 				fprintf(out, "%16ju ", !iflag ? tlast - tnow :
 				    tnow - tlast);