From owner-svn-src-user@FreeBSD.ORG  Wed Oct 15 20:44:00 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A65311065687;
	Wed, 15 Oct 2008 20:44:00 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8DBB58FC08;
	Wed, 15 Oct 2008 20:44:00 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9FKi0ku042941;
	Wed, 15 Oct 2008 20:44:00 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9FKi0iL042940;
	Wed, 15 Oct 2008 20:44:00 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200810152044.m9FKi0iL042940@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Wed, 15 Oct 2008 20:44:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r183924 - user/edwin/top/top-3.8b1/usr.bin/top
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Oct 2008 20:44:00 -0000

Author: edwin
Date: Wed Oct 15 20:44:00 2008
New Revision: 183924
URL: http://svn.freebsd.org/changeset/base/183924

Log:
  Use P_INMEM for >= 7, and PS_INMEM otherwise.
  
  Fix comment about "successfull" at the same time.
  
  Submitted by:	John Baldwin <john@baldwin.cx>, bde@

Modified:
  user/edwin/top/top-3.8b1/usr.bin/top/machine.c

Modified: user/edwin/top/top-3.8b1/usr.bin/top/machine.c
==============================================================================
--- user/edwin/top/top-3.8b1/usr.bin/top/machine.c	Wed Oct 15 19:24:18 2008	(r183923)
+++ user/edwin/top/top-3.8b1/usr.bin/top/machine.c	Wed Oct 15 20:44:00 2008	(r183924)
@@ -737,7 +737,7 @@ fmt_command(char *buf, int sz, struct ki
     char *rawcmd;
     int argc;
 
-#if OSMAJOR > 4
+#if OSMAJOR >= 7
     inmem = (PP(pp, flag) & P_INMEM);
 #else
     inmem = (PP(pp, sflag) & PS_INMEM);
@@ -749,7 +749,8 @@ fmt_command(char *buf, int sz, struct ki
         if ((args = kvm_getargv(kd, pp, sz)) != NULL)
         {
 	    /*
-	     * successfull retrieval: now convert nulls and cr/lf in to spaces
+	     * Successful retrieval.
+	     * Now convert nulls and cr/lf in to spaces.
 	     */
 	    bufp = cmd;
 	    cmd[0] = '\0';