From owner-p4-projects@FreeBSD.ORG  Mon Jan 30 22:29:09 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D0EF31065672; Mon, 30 Jan 2012 22:29:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 93088106564A
	for <perforce@freebsd.org>; Mon, 30 Jan 2012 22:29:08 +0000 (UTC)
	(envelope-from peter@wemm.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 804208FC0A
	for <perforce@freebsd.org>; Mon, 30 Jan 2012 22:29:08 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0UMT879026857
	for <perforce@freebsd.org>; Mon, 30 Jan 2012 22:29:08 GMT
	(envelope-from peter@wemm.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0UMT8JJ026854
	for perforce@freebsd.org; Mon, 30 Jan 2012 22:29:08 GMT
	(envelope-from peter@wemm.org)
Date: Mon, 30 Jan 2012 22:29:08 GMT
Message-Id: <201201302229.q0UMT8JJ026854@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	peter@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 205432 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 30 Jan 2012 22:29:09 -0000

http://p4web.freebsd.org/@@205432?ac=10

Change 205432 by peter@peter_daintree on 2012/01/30 22:28:58

	Merge conflict with local changes, disable

Affected files ...

.. //depot/projects/hammer/bin/ps/print.c#31 edit

Differences ...

==== //depot/projects/hammer/bin/ps/print.c#31 (text+ko) ====

@@ -115,9 +115,11 @@
 command(KINFO *k, VARENT *ve)
 {
 	char *vis_args, *vis_env, *str;
+#if 0
 	int flag;
 
 	flag = k->ki_p->ki_flag;
+#endif
 	if (cflag) {
 		/* If it is the last field, then don't pad */
 		if (STAILQ_NEXT(ve, next_ve) == NULL) {
@@ -131,6 +133,7 @@
 
 		return (str);
 	}
+#if 0
 	if (showthreads && (k->ki_p->ki_flag & P_SYSTEM) != 0 &&
 	    k->ki_p->ki_numthreads > 1) {
 		/* If it is the last field, then don't pad */
@@ -143,6 +146,7 @@
 		free(kth);
 		return;
 	}
+#endif
 	if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
 		errx(1, "malloc failed");
 	strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);