===================================================================
RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v
retrieving revision 1.27
retrieving revision 1.29
diff -u -r1.27 -r1.29
--- nagios/check_hw_sensors/check_hw_sensors	2009/11/09 22:51:44	1.27
+++ nagios/check_hw_sensors/check_hw_sensors	2009/11/09 23:06:26	1.29
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# $RedRiver: check_hw_sensors,v 1.26 2009/11/09 21:25:07 andrew Exp $
+# $RedRiver: check_hw_sensors,v 1.28 2009/11/09 22:58:41 andrew Exp $
 ########################################################################
 # check_hw_sensors *** A nagios check for OpenBSD sysctl hw.sensors
 #
@@ -45,13 +45,13 @@
 
 my $state = 'UNKNOWN';    # tells whether the it is warning, critical, or OK
 my %states;               # This stores the count of states;
-my $filename;
+my $opt_V;
+my $opt_h;
 my $ignore_status;
+my $filename;
 my $sensor;
 my $warning;
 my $critical;
-my $opt_h;
-my $opt_V;
 
 my $CHECK_SENSOR = $BASE;
 my %CHECKS;
@@ -61,8 +61,8 @@
 my $status = GetOptions(
     "version|V"       => \$opt_V,
     "help|h"          => \$opt_h,
-    "filename|f:s"    => \$filename,
     "ignore-status|i" => \$ignore_status,
+    "filename|f:s"    => \$filename,
     "sensor|s=s"      => \$sensor,
     "warning|w=s"     => \$warning,
     "critical|c=s"    => \$critical,
@@ -118,16 +118,11 @@
 }
 
 if ($opt_V) {
-    print_revision( $PROGNAME, '$Revision: 1.27 $ ' );
+    print_revision( $PROGNAME, '$Revision: 1.29 $ ' );
     exit $ERRORS{'OK'};
 }
 
-if ($opt_h
-    || ( ( !defined $filename ) && ( !defined $sensor ) )
-
-    #|| ( defined $sensor && !( $warning || $critical ) )
-    )
-{
+if ($opt_h) {
     print_help();
     exit $ERRORS{'OK'};
 }
@@ -214,7 +209,7 @@
         $r = check_sensor( $SENSORS{$s}, $CHECKS{$s} );
         $data = $s . '=' . $SENSORS{$s}{'output'};
     }
-    elsif ( not $ignore_status ) {
+    elsif ( !$ignore_status ) {
         $r    = check_sensor( $SENSORS{$s} );
         $data = $s . '=' . $SENSORS{$s}{'output'};
     }
@@ -590,7 +585,7 @@
 
 EOL
 
-    print_revision( $PROGNAME, '$Revision: 1.27 $' );
+    print_revision( $PROGNAME, '$Revision: 1.29 $' );
 
     print $License;
 }