Changeset 5829

Timestamp:

03/08/10 14:59:47 (3 years ago)

Author:

khali

Message:

Use fewer global variables, to make the code easier to read and
modify.

Files:

• i2c-tools/trunk/stub/i2c-stub-from-dump (modified) (4 diffs)

i2c-tools/trunk/stub/i2c-stub-from-dump

@@ -23 +23 @@
 
 use strict;
-use vars qw($bus_nr $addr $bytes $words $err);
+use vars qw($bus_nr $addr $err);
 
 # Kernel version detection code by Mark M. Hoffman,
@@ -117 +117 @@
 sub process_dump
 {
-        my $dump = shift;
+        my ($addr, $dump) = @_;
         my $err = 0;
+        my ($bytes, $words);
 
         open(DUMP, $dump) || die "Can't open $dump: $!\n";
@@ -157 +158 @@
         close(DUMP);
 
+        if ($bytes) {
+                printf SAVEOUT "$bytes byte values written to \%d-\%04x\n",
+                        $bus_nr, $addr;
+        }
+
+        if ($words) {
+                printf SAVEOUT "$words word values written to \%d-\%04x\n",
+                        $bus_nr, $addr;
+        }
+
+        if (!$err && !$bytes && !$words) {
+                printf SAVEOUT "Only garbage found in dump file $dump\n";
+                $err = 1;
+        }
+
         return $err;
 }
@@ -180 +196 @@
 
 $bus_nr = load_kernel_drivers($addr);
-$bytes = $words = 0;
 
 # We don't want to see the output of 256 i2cset
 open(SAVEOUT, ">&STDOUT");
 open(STDOUT, ">/dev/null");
-$err = process_dump($ARGV[1]);
+$err = process_dump(oct $addr, $ARGV[1]);
 close(STDOUT);
 
-if ($bytes) {
-        printf SAVEOUT "$bytes byte values written to \%d-\%04x\n",
-                $bus_nr, oct($addr);
-}
-
-if ($words) {
-        printf SAVEOUT "$words word values written to \%d-\%04x\n",
-                $bus_nr, oct($addr);
-}
-
-if (!$err && ($bytes + $words == 0)) {
-        printf SAVEOUT "Only garbage found in dump file $ARGV[1]\n";
-        exit(1);
-}
-
 exit($err);