Attachment 167253 Details for Bug 207378 – A retry of the same patch - the previous attempt was apparently corrupted in transit

[patch] A retry of the same patch - the previous attempt was apparently corrupted in transit

iostat.c.patch (text/plain), 1.87 KB, created by jau on 2016-02-21 13:25:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jau

Created: 2016-02-21 13:25:10 UTC

Size: 1.87 KB

patch

obsolete

>Index: usr.sbin/iostat/iostat.c
>===================================================================
>--- usr.sbin/iostat/iostat.c	(revision 295843)
>+++ usr.sbin/iostat/iostat.c	(working copy)
>@@ -797,7 +797,7 @@
> 	long double total_mb, blocks_per_second, total_duration;
> 	long double ms_per_other, ms_per_read, ms_per_write, ms_per_transaction;
> 	int firstline = 1;
>-	char *devname;
>+	char *dev_name;
> 
> 	if (xflag > 0) {
> 		printf("                        extended device statistics  ");
>@@ -871,7 +871,7 @@
> 		}
> 
> 		if (xflag > 0) {
>-			if (asprintf(&devname, "%s%d",
>+			if (asprintf(&dev_name, "%s%d",
> 			    cur.dinfo->devices[di].device_name,
> 			    cur.dinfo->devices[di].unit_number) == -1)
> 				err(1, "asprintf");
>@@ -887,7 +887,7 @@
> 					printf("%-8.8s %5d %5d %8.1Lf "
> 					    "%8.1Lf %5d %5d %5d %5d "
> 					    "%4" PRIu64 " %3.0Lf ",
>-					    devname,
>+					    dev_name,
> 					    (int)transfers_per_second_read,
> 					    (int)transfers_per_second_write,
> 					    mb_per_second_read * 1024,
>@@ -900,7 +900,7 @@
> 					printf("%-8.8s %11.1Lf %11.1Lf "
> 					    "%12.1Lf %12.1Lf %4" PRIu64
> 					    " %10.1Lf %9.1Lf ",
>-					    devname,
>+					    dev_name,
> 					    (long double)total_transfers_read,
> 					    (long double)total_transfers_write,
> 					    (long double)
>@@ -925,7 +925,7 @@
> 				}
> 				printf("\n");
> 			}
>-			free(devname);
>+			free(dev_name);
> 		} else if (oflag > 0) {
> 			int msdig = (ms_per_transaction < 100.0) ? 1 : 0;
> 
>@@ -979,15 +979,15 @@
> cpustats(void)
> {
> 	int state;
>-	double time;
>+	double total;
> 
>-	time = 0.0;
>+	total = 0.0;
> 
> 	for (state = 0; state < CPUSTATES; ++state)
>-		time += cur.cp_time[state];
>+		total += cur.cp_time[state];
> 	for (state = 0; state < CPUSTATES; ++state)
> 		printf(" %2.0f",
>-		       rint(100. * cur.cp_time[state] / (time ? time : 1)));
>+		       rint(100. * cur.cp_time[state] / (total ? total : 1)));
> }
> 
> static int

Actions: View | Diff

Attachments on bug 207378: 167238 | 167253