From 7a485557488f70e0a262d11f5ec64b0d657e0023 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 25 Jun 2007 17:08:15 +0000 Subject: [PATCH] Fix the case where the system has different CPU models. git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4467 7894878c-1315-0410-8ee3-d5d059ff63e0 --- prog/detect/sensors-detect | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index 45effd70..e17ee22c 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -2244,11 +2244,12 @@ sub initialize_cpu_list { open(local *INPUTFILE, "/proc/cpuinfo") or die "Can't access /proc/cpuinfo!"; local $_; - my %entry; + my $entry; + while () { 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; } if (m/^(vendor_id|cpu family|model|model name|stepping)\s*:\s*(.+)$/) { @@ -2256,11 +2257,11 @@ sub initialize_cpu_list my $v = $2; $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; }