CVS commit: src/usr.bin/kdump

[Luke Mewburn]

Module Name:    src
Committed By:   lukem
Date:           Sun Apr 12 11:23:12 UTC 2009

Modified Files:
        src/usr.bin/kdump: kdump.c

Log Message:
fix sign-compare issues


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/kdump/kdump.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.102 src/usr.bin/kdump/kdump.c:1.103
--- src/usr.bin/kdump/kdump.c:1.102	Sun Jan 11 03:05:41 2009
+++ src/usr.bin/kdump/kdump.c	Sun Apr 12 11:23:12 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: kdump.c,v 1.102 2009/01/11 03:05:41 christos Exp $	*/
+/*	$NetBSD: kdump.c,v 1.103 2009/04/12 11:23:12 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)kdump.c	8.4 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: kdump.c,v 1.102 2009/01/11 03:05:41 christos Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.103 2009/04/12 11:23:12 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -542,21 +542,21 @@
 			if (strcmp(emul->name, "linux") == 0 ||
 			    strcmp(emul->name, "linux32") == 0) {
 				if ((long)*ap >= 0 && *ap <
-				    sizeof(linux_ptrace_ops) /
-				    sizeof(linux_ptrace_ops[0]))
+				    (register_t)(sizeof(linux_ptrace_ops) /
+				    sizeof(linux_ptrace_ops[0])))
 					(void)printf("%s",
 					    linux_ptrace_ops[*ap]);
 				else
 					output_long((long)*ap, 1);
 			} else {
 				if ((long)*ap >= 0 && *ap <
-				    sizeof(ptrace_ops) / sizeof(ptrace_ops[0]))
+				    (register_t)(sizeof(ptrace_ops) / sizeof(ptrace_ops[0])))
 					(void)printf("%s", ptrace_ops[*ap]);
 #ifdef PT_MACHDEP_STRINGS
 				else if (*ap >= PT_FIRSTMACH &&
 				    *ap - PT_FIRSTMACH <
-						sizeof(ptrace_machdep_ops) /
-						sizeof(ptrace_machdep_ops[0]))
+				    (register_t)(sizeof(ptrace_machdep_ops) /
+						sizeof(ptrace_machdep_ops[0])))
 					(void)printf("%s", ptrace_machdep_ops[*ap - PT_FIRSTMACH]);
 #endif
 				else
@@ -602,7 +602,7 @@
 	switch (error) {
 	case 0:
 		rprint(ktr->ktr_retval);
-		if (len > offsetof(struct ktr_sysret, ktr_retval_1) &&
+		if (len > (int)offsetof(struct ktr_sysret, ktr_retval_1) &&
 		    ktr->ktr_retval_1 != 0) {
 			(void)printf(", ");
 			rprint(ktr->ktr_retval_1);
@@ -1035,7 +1035,7 @@
 static void
 ktrmib(int *namep, int len)
 {
-	int i;
+	size_t i;
 
 	for (i = 0; i < (len / sizeof(*namep)); i++)
 		printf("%s%d", (i == 0) ? "" : ".", namep[i]);