Changeset 5706 for i2c-tools/trunk

Timestamp:

03/20/09 15:40:59 (3 years ago)

Author:

khali

Message:

Automatically adjust the width of columns in text side-by-side mode.

Files:

• i2c-tools/trunk/eeprom/decode-dimms (modified) (3 diffs)

i2c-tools/trunk/eeprom/decode-dimms

@@ -42 +42 @@
 use Fcntl qw(:DEFAULT :seek);
 use vars qw($opt_html $opt_bodyonly $opt_side_by_side $opt_merge
-            $opt_igncheck $use_sysfs $use_hexdump
+            $opt_igncheck $use_sysfs $use_hexdump $sbs_col_width
             @vendors %decode_callback $revision @dimm $current %hexdump_cache);
 
@@ -393 +393 @@
                 }
 
-                my $format = "%-47s".(" %-19s" x (scalar @values - 1))." %s\n";
+                my $format = "%-47s".((" %-".$sbs_col_width."s") x (scalar @values - 1))." %s\n";
                 my $maxl = 0; # Keep track of the max number of lines
 
@@ -1880 +1880 @@
 }
 
+# Find out the longest value string to adjust the column width
+# Note: this could be improved a bit by not taking into account strings
+# which will end up being merged.
+$sbs_col_width = 15;
+if ($opt_side_by_side && !$opt_html) {
+        for $current (0 .. $#dimm) {
+                my @output = @{$dimm[$current]->{output}};
+                my $line;
+                my @strings;
+
+                for ($line = 0; $line < @output; $line++) {
+                        my ($func, $label, $value) = @{$output[$line]};
+                        push @strings, split("\n", $value) if defined $value;
+                }
+
+                foreach $line (@strings) {
+                        my $len = length($line);
+                        $sbs_col_width = $len if $len > $sbs_col_width;
+                }
+        }
+}
+
 # Print the decoded information for all DIMMs
 for $current (0 .. $#dimm) {