From owner-p4-projects@FreeBSD.ORG  Wed Jul  9 12:04:44 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6C37137B404; Wed,  9 Jul 2003 12:04:43 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F2F8E37B401
	for <perforce@freebsd.org>; Wed,  9 Jul 2003 12:04:42 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9ADF143F85
	for <perforce@freebsd.org>; Wed,  9 Jul 2003 12:04:42 -0700 (PDT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h69J4g0U043632
	for <perforce@freebsd.org>; Wed, 9 Jul 2003 12:04:42 -0700 (PDT)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h69J4gKV043629
	for perforce@freebsd.org; Wed, 9 Jul 2003 12:04:42 -0700 (PDT)
Date: Wed, 9 Jul 2003 12:04:42 -0700 (PDT)
Message-Id: <200307091904.h69J4gKV043629@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 34258 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jul 2003 19:04:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=34258

Change 34258 by jhb@jhb_laptop on 2003/07/09 12:04:05

	Port show ktr to the simple pager.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_ktr.c#21 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_ktr.c#21 (text+ko) ====

@@ -267,9 +267,9 @@
 
 DB_SHOW_COMMAND(ktr, db_ktr_all)
 {
-	int	c, lines;
-	int	all = 0;
-
+	int c, quit;
+	
+	quit = 0;
 	lines = NUM_LINES_PER_PAGE;
 	tstate.cur = (ktr_idx - 1) & (KTR_ENTRIES - 1);
 	tstate.first = -1;
@@ -277,28 +277,16 @@
 		db_ktr_verbose = 1;
 	else
 		db_ktr_verbose = 0;
-	if (strcmp(modif, "a") == 0)
-		all = 1;
-	while (db_mach_vtrace())
-		if (all) {
-			if (cncheckc() != -1)
-				return;
-		} else if (--lines == 0) {
-			db_printf("--More--");
-			c = cngetc();
-			db_printf("\r");
-			switch (c) {
-			case '\n':	/* one more line */
-				lines = 1;
+	if (strcmp(modif, "a") == 0) {
+		while (cncheckc() != -1)
+			if (db_mach_vtrace() == 0)
 				break;
-			case ' ':	/* one more page */
-				lines = NUM_LINES_PER_PAGE;
+	} else {
+		db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE);
+		while (!quit)
+			if (db_mach_vtrace() == 0)
 				break;
-			default:
-				db_printf("\n");
-				return;
-			}
-		}
+	}
 }
 
 static int