svn commit: r192150 - stable/7/usr.bin/top

[John Baldwin]

Author: jhb
Date: Fri May 15 19:19:27 2009
New Revision: 192150
URL: http://svn.freebsd.org/changeset/base/192150

Log:
  MFC: Expand the CPU column to two chars and print in decimal rather than
  hex.

Modified:
  stable/7/usr.bin/top/   (props changed)
  stable/7/usr.bin/top/machine.c

Modified: stable/7/usr.bin/top/machine.c
==============================================================================
--- stable/7/usr.bin/top/machine.c	Fri May 15 18:50:30 2009	(r192149)
+++ stable/7/usr.bin/top/machine.c	Fri May 15 19:19:27 2009	(r192150)
@@ -106,12 +106,12 @@ static char io_header[] =
     "%5d%s %-*.*s %6ld %6ld %6ld %6ld %6ld %6ld %6.2f%% %.*s"
 
 static char smp_header_thr[] =
-    "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE  C   TIME %6s COMMAND";
+    "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE   C   TIME %6s COMMAND";
 static char smp_header[] =
-    "  PID%s %-*.*s "   "PRI NICE   SIZE    RES STATE  C   TIME %6s COMMAND";
+    "  PID%s %-*.*s "   "PRI NICE   SIZE    RES STATE   C   TIME %6s COMMAND";
 
 #define smp_Proc_format \
-    "%5d%s %-*.*s %s%3d %4s%7s %6s %-6.6s %1x%7s %5.2f%% %.*s"
+    "%5d%s %-*.*s %s%3d %4s%7s %6s %-6.6s %2d%7s %5.2f%% %.*s"
 
 static char up_header_thr[] =
     "  PID%s %-*.*s  THR PRI NICE   SIZE    RES STATE    TIME %6s COMMAND";