Changeset 4467

Timestamp:

06/25/07 19:08:15 (6 years ago)

Author:

khali

Message:

Fix the case where the system has different CPU models.

Files:

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

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

@@ -2245 +2245 @@
   open(local *INPUTFILE, "/proc/cpuinfo") or die "Can't access /proc/cpuinfo!";
   local $_;
-  my %entry;
+  my $entry;
+
   while (<INPUTFILE>) {
     if (m/^processor\s*:\s*(\d+)/) {
-      push @cpu, \%entry if scalar keys(%entry); # Previous entry
-      %entry = (); # New entry
+      push @cpu, $entry if scalar keys(%{$entry}); # Previous entry
+      $entry = {}; # New entry
       next;
     }
@@ -2257 +2258 @@
       $v =~ s/\s+/ /g;  # Merge multiple spaces
       $v =~ s/ $//;     # Trim trailing space
-      $entry{$k} = $v;
+      $entry->{$k} = $v;
       next;
     }
   }
-  push @cpu, \%entry if scalar keys(%entry); # Last entry
+  push @cpu, $entry if scalar keys(%{$entry}); # Last entry
   close INPUTFILE;
 }