Changeset 5467

Timestamp:

11/30/08 13:24:42 (4 years ago)

Author:

khali

Message:

Reindent auxiliary functions.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect (modified) (3 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect

@@ -1711 +1711 @@
 # $_[0] is the sought value
 # @_[1..] is the list to seek in
-# Returns: 0 on failure, 1 if found.
-# Note: Every use of this sub probably indicates the use of the wrong
-#       datastructure
+# Returns: 1 if found, 0 if not.
 sub contains
 {
-  my $sought = shift;
-  foreach (@_) {
-    return 1 if $sought eq $_;
-  }
-  return 0;
+        my $sought = shift;
+        local $_;
+
+        foreach (@_) {
+                return 1 if $sought eq $_;
+        }
+        return 0;
 }
 
@@ -1726 +1726 @@
 sub valid_address
 {
-  my $value = shift;
-
-  if ($value !~ m/^(0x[0-9a-f]+|[0-9]+)$/i) {
-    print "$value is not a valid address, sorry.\n";
-    exit -1;
-  }
-  $value = oct($value) if $value =~ /^0x/i;
-
-  return $value;
+        my $value = shift;
+
+        if ($value !~ m/^(0x[0-9a-f]+|[0-9]+)$/i) {
+                print "$value is not a valid address, sorry.\n";
+                exit -1;
+        }
+        $value = oct($value) if $value =~ m/^0x/i;
+
+        return $value;
 }
 
 sub parse_not_to_scan
 {
-  my ($min, $max, $to_parse) = @_;
-  my @ranges = split /\s*, \s*/, $to_parse;
-  my @res;
-  my $range;
-  foreach $range (@ranges) {
-    my ($start, $end) = split /\s*-\s*/, $range;
-    $start = valid_address($start);
-    if (defined $end) {
-      $end = valid_address($end);
-      if ($end <= $start) {
-        print "$start-$end is not a valid range, sorry.\n";
-        exit -1;
-      }
-      $start = $min if $start < $min;
-      $end = $max if $end > $max;
-      push @res, ($start..$end);
-    } else {
-      push @res, $start if $start >= $min and $start <= $max;
-    }
-  }
-  return sort { $a <=> $b } @res;
+        my ($min, $max, $to_parse) = @_;
+        my @ranges = split /\s*, \s*/, $to_parse;
+        my @res;
+        my $range;
+
+        foreach $range (@ranges) {
+                my ($start, $end) = split /\s*-\s*/, $range;
+                $start = valid_address($start);
+                if (defined $end) {
+                        $end = valid_address($end);
+                        if ($end <= $start) {
+                                print "$start-$end is not a valid range, sorry.\n";
+                                exit -1;
+                        }
+                        $start = $min if $start < $min;
+                        $end = $max if $end > $max;
+                        push @res, ($start..$end);
+                } else {
+                        push @res, $start if $start >= $min and $start <= $max;
+                }
+        }
+
+        return sort { $a <=> $b } @res;
 }
 
@@ -1768 +1770 @@
 sub any_list_match
 {
-  my ($list1, $list2) = @_;
-  my ($el1, $el2);
-  foreach $el1 (@$list1) {
-    foreach $el2 (@$list2) {
-      return 1 if $el1 == $el2;
-    }
-  }
-  return 0;
+        my ($list1, $list2) = @_;
+        my ($el1, $el2);
+
+        foreach $el1 (@$list1) {
+                foreach $el2 (@$list2) {
+                        return 1 if $el1 == $el2;
+                }
+        }
+        return 0;
 }