===================================================================
RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v
retrieving revision 1.28
retrieving revision 1.30
diff -u -r1.28 -r1.30
--- nagios/check_hw_sensors/check_hw_sensors	2009/11/09 22:58:41	1.28
+++ nagios/check_hw_sensors/check_hw_sensors	2009/11/09 23:13:04	1.30
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# $RedRiver: check_hw_sensors,v 1.27 2009/11/09 22:51:44 andrew Exp $
+# $RedRiver: check_hw_sensors,v 1.29 2009/11/09 23:06:26 andrew Exp $
 ########################################################################
 # check_hw_sensors *** A nagios check for OpenBSD sysctl hw.sensors
 #
@@ -118,18 +118,11 @@
 }
 
 if ($opt_V) {
-    print_revision( $PROGNAME, '$Revision: 1.28 $ ' );
+    print_revision( $PROGNAME, '$Revision: 1.30 $ ' );
     exit $ERRORS{'OK'};
 }
 
-if ($opt_h
-    || (   ( !defined $filename )
-        && ( !defined $sensor )
-        && ( !defined $ignore_status ) )
-
-    #|| ( defined $sensor && !( $warning || $critical ) )
-    )
-{
+if ($opt_h) {
     print_help();
     exit $ERRORS{'OK'};
 }
@@ -532,7 +525,7 @@
 sub print_help {
     print <<"EOL";
 $PROGNAME - monitors sysctl hw.sensors on OpenBSD
-    $PROGNAME [-i] (-f [<FILENAME>]|(-s <hw.sensors id> [-w limit] [-c limit]))
+    $PROGNAME [-i] [-f [<FILENAME>]|(-s <hw.sensors id> [-w limit] [-c limit])]
 
 Usage:
     -i, --ignore-status
@@ -592,7 +585,7 @@
 
 EOL
 
-    print_revision( $PROGNAME, '$Revision: 1.28 $' );
+    print_revision( $PROGNAME, '$Revision: 1.30 $' );
 
     print $License;
 }