===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/sensors.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -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,166 ****
--- 161,167 ----
  			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,199 ****
  	case SENSOR_AMPHOUR:
  		mvwprintw(wnd, row, 24, "%10.2f Ah", sensor.value / 1000000.0);
  		break;
- 		/* FALLTHROUGH */
  	default:
  		mvwprintw(wnd, row, 24, "%10lld", sensor.value);
  	}
! 	if (sensor.desc != NULL && strlen(sensor.desc) < 1)
! 		mvwprintw(wnd, row, 58, "(%s%d)",
! 		    sensor_type_s[sensor.type], sensor.numt);
! 	else
  		mvwprintw(wnd, row, 58, "(%s)", sensor.desc);
  
  	switch (sensor.status) {
  	case SENSOR_S_UNKNOWN:
! 		mvwaddstr(wnd, row++, 45, "unknown");
  		break;
  	case SENSOR_S_WARN:
! 		mvwaddstr(wnd, row++, 45, "WARNING");
  		break;
  	case SENSOR_S_CRIT:
! 		mvwaddstr(wnd, row++, 45, "CRITICAL");
  		break;
! 		/* FALLTHROUGH */
! 	default:
! 		mvwaddstr(wnd, row++, 45, "OK");
  		break;
  	}
  }
--- 172,197 ----
  	case SENSOR_AMPHOUR:
  		mvwprintw(wnd, row, 24, "%10.2f Ah", sensor.value / 1000000.0);
  		break;
  	default:
  		mvwprintw(wnd, row, 24, "%10lld", sensor.value);
+ 		break;
  	}
! 	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");
  		break;
  	case SENSOR_S_WARN:
! 		mvwaddstr(wnd, row, 45, "WARNING");
  		break;
  	case SENSOR_S_CRIT:
! 		mvwaddstr(wnd, row, 45, "CRITICAL");
  		break;
! 	case SENSOR_S_OK:
! 		mvwaddstr(wnd, row, 45, "OK");
  		break;
  	}
+ 	row++;
  }