PERFORCE change 205432 for review

[Peter Wemm]

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

Change 205432 by peter at 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);