===================================================================
RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -r1.5 -r1.7
--- nagios/check_hw_sensors/check_hw_sensors	2006/05/02 20:49:29	1.5
+++ nagios/check_hw_sensors/check_hw_sensors	2006/05/02 21:03:53	1.7
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: check_hw_sensors,v 1.4 2006/05/02 15:54:42 andrew Exp $
+# $RedRiver: check_hw_sensors,v 1.6 2006/05/02 19:59:47 andrew Exp $
 ########################################################################
 # check_hw_sensors *** A nagios check for OpenBSD hw.sensors
 # 
@@ -65,7 +65,7 @@
 }
 
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 1.5 $ ');
+	print_revision($PROGNAME,'$Revision: 1.7 $ ');
 	exit $ERRORS{'OK'};
 }
 
@@ -161,13 +161,15 @@
 foreach my $error (sort { $ERRORS{$b} <=> $ERRORS{$a} } keys %ERRORS) {
 	if (exists $states{$error}) {
 		if (NAGIOS_OUTPUT) {
-			print "<li>$error (" . scalar(@{ $states{ $error } }) . "):<ul>";
+			print "<li>$error (" . scalar(@{ $states{ $error } }) . ")";
 			unless ($error eq 'OK') {
+				print '<ul>';
 				foreach (@{ $states{ $error } }) {
 					print "<li>$_</li>";
 				}
+				print '</ul>';
 			}
-			print "</ul></li>"
+			print "</li>"
 		} else {
 			print "$error (" . scalar(@{ $states{ $error } }) . "):\n";
 			foreach (@{ $states{ $error } }) {
@@ -306,7 +308,7 @@
 				foreach my $c (@{ $check->{$code} }) {
 					$c =~ s/[^\d\.]//g;
 					unless (length $c) {
-						warn "INVALID CHECK (" . $check->{$code} .
+						warn "INVALID CHECK (" . $c .
 						      ") for '$sensor->{'id'}:$code'";
 						next;
 					}
@@ -384,7 +386,7 @@
 
 					$c =~ s/[^\d\.]//g;
 					unless (length $c) {
-						warn "INVALID CHECK (" . $check->{$code} .
+						warn "INVALID CHECK (" . $c .
 							 ") for '$sensor->{'id'}':$code";
 						next;
 					}
@@ -452,6 +454,6 @@
 
 EOL
 	
-	print_revision($PROGNAME, '$Revision: 1.5 $');
+	print_revision($PROGNAME, '$Revision: 1.7 $');
 }