From owner-p4-projects  Sun Sep 15 19:32:57 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0562537B401; Sun, 15 Sep 2002 19:32:55 -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 7CCAA37B400
	for <perforce@freebsd.org>; Sun, 15 Sep 2002 19:32:54 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3C62843E3B
	for <perforce@freebsd.org>; Sun, 15 Sep 2002 19:32:54 -0700 (PDT)
	(envelope-from julian@freebsd.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8G2WsJU002430
	for <perforce@freebsd.org>; Sun, 15 Sep 2002 19:32:54 -0700 (PDT)
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8G2Wsa1002427
	for perforce@freebsd.org; Sun, 15 Sep 2002 19:32:54 -0700 (PDT)
Date: Sun, 15 Sep 2002 19:32:54 -0700 (PDT)
Message-Id: <200209160232.g8G2Wsa1002427@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
Subject: PERFORCE change 17549 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17549

Change 17549 by julian@julian_jules1 on 2002/09/15 19:32:19

	 This got left out in the last merge from -current 
	 I have no idea why..

Affected files ...

.. //depot/projects/kse/bin/ps/print.c#13 edit

Differences ...

==== //depot/projects/kse/bin/ps/print.c#13 (text+ko) ====

@@ -37,7 +37,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.69 2002/07/11 17:28:29 bde Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.70 2002/09/13 07:13:33 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -65,7 +65,7 @@
 #include "lomac.h"
 #include "ps.h"
 
-static void printval(void *, VAR *);
+#define	ps_pgtok(a)	(((a) * getpagesize()) / 1024)
 
 void
 printheader(void)
@@ -477,10 +477,6 @@
 	}
 }
 
-#ifndef pgtok
-#define pgtok(a)        (((a)*getpagesize())/1024)
-#endif
-
 void
 vsize(KINFO *k, VARENT *ve)
 {
@@ -629,7 +625,7 @@
 	VAR *v;
 
 	v = ve->var;
-	(void)printf("%*ld", v->width, (long)pgtok(k->ki_p->ki_tsize));
+	(void)printf("%*ld", v->width, (long)ps_pgtok(k->ki_p->ki_tsize));
 }
 
 void

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message