socsvn commit: r225306 - soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat

[oleksandr at FreeBSD.org]

Author: oleksandr
Date: Sat Aug 20 15:44:03 2011
New Revision: 225306
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=225306

Log:
  Some change in iostat

Modified:
  soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.8
  soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.c

Modified: soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.8
==============================================================================
--- soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.8	Sat Aug 20 15:35:46 2011	(r225305)
+++ soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.8	Sat Aug 20 15:44:03 2011	(r225306)
@@ -135,11 +135,11 @@
 Write errors
 .It Other
 Read/write errors
-.It Recoverable
+.It Recovered
 Recovered data with retries
 .It Device Not Ready
 Medium not present
-.It Media
+.It Medium
 Address mark not found or logical block of address out of range
 .It Hardware
 Internal target failure

Modified: soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.c
==============================================================================
--- soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.c	Sat Aug 20 15:35:46 2011	(r225305)
+++ soc2011/oleksandr/oleksandr-head/head/usr.sbin/iostat/iostat.c	Sat Aug 20 15:44:03 2011	(r225306)
@@ -814,10 +814,10 @@
 			    cur.dinfo->devices[di].device_name,
 			    cur.dinfo->devices[di].unit_number) == -1)
 				err(1, "aspRintf");
-		        printf("Device: %-8.8s Retriable: %d Non-retriable: %d "
-                               "Read: %d Write: %d Other: %d        " 
-                               "Recovered: %d Device Not Ready: %d Media: %d "
-                               "Hardware: %d Illegal Request: %d        "
+		        printf("Device: %-8.8s  Retriable: %d Non-retriable: %d "
+                               "Read: %d Write: %d Other: %d\n" 
+                               "Recovered: %d Device Not Ready: %d Medium: %d "
+                               "Hardware: %d Illegal Request: %d\n"
                                "Unit Attention: %d Aborted Command: %d",
                                 devname,
        		                cur.dinfo->devices[di].dev_error.retriable,
@@ -825,11 +825,11 @@
     			        cur.dinfo->devices[di].dev_error.read_error,
   			        cur.dinfo->devices[di].dev_error.write_error,
    			        cur.dinfo->devices[di].dev_error.other_error,
-   			        cur.dinfo->devices[di].dev_error.recoverable,
+   			        cur.dinfo->devices[di].dev_error.recovered,
    			        cur.dinfo->devices[di].dev_error.not_ready,
-  			        cur.dinfo->devices[di].dev_error.media_error,
+  			        cur.dinfo->devices[di].dev_error.medium_error,
   			        cur.dinfo->devices[di].dev_error.hardware,
-  			        cur.dinfo->devices[di].dev_error.illegal_req,
+  			        cur.dinfo->devices[di].dev_error.illegal_request,
   			        cur.dinfo->devices[di].dev_error.unit_attention,
   			        cur.dinfo->devices[di].dev_error.aborted_command);
 			printf("\n");