===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/sensors.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/systat/sensors.c	2007/02/23 22:09:53	1.2
+++ src/usr.bin/systat/sensors.c	2007/02/23 22:24:22	1.3
@@ -161,6 +161,7 @@
 			mvwprintw(wnd, row, 24, "%15s", drvstat[sensor.value]);
 			break;
 		}
+		break;
 	case SENSOR_TIMEDELTA:
 		mvwprintw(wnd, row, 24, "%10.6f secs",
 		    sensor.value / 1000000000.0);
@@ -171,29 +172,26 @@
 	case SENSOR_AMPHOUR:
 		mvwprintw(wnd, row, 24, "%10.2f Ah", sensor.value / 1000000.0);
 		break;
-		/* FALLTHROUGH */
 	default:
 		mvwprintw(wnd, row, 24, "%10lld", sensor.value);
+		break;
 	}
-	if (sensor.desc != NULL && strlen(sensor.desc) < 1)
-		mvwprintw(wnd, row, 58, "(%s%d)",
-		    sensor_type_s[sensor.type], sensor.numt);
-	else
+	if (sensor.desc && strlen(sensor.desc) >= 1)
 		mvwprintw(wnd, row, 58, "(%s)", sensor.desc);
 
 	switch (sensor.status) {
 	case SENSOR_S_UNKNOWN:
-		mvwaddstr(wnd, row++, 45, "unknown");
+		mvwaddstr(wnd, row, 45, "unknown");
 		break;
 	case SENSOR_S_WARN:
-		mvwaddstr(wnd, row++, 45, "WARNING");
+		mvwaddstr(wnd, row, 45, "WARNING");
 		break;
 	case SENSOR_S_CRIT:
-		mvwaddstr(wnd, row++, 45, "CRITICAL");
+		mvwaddstr(wnd, row, 45, "CRITICAL");
 		break;
-		/* FALLTHROUGH */
-	default:
-		mvwaddstr(wnd, row++, 45, "OK");
+	case SENSOR_S_OK:
+		mvwaddstr(wnd, row, 45, "OK");
 		break;
 	}
+	row++;
 }