Browse Source

Refactor HTML filtering into a separate function.

git-svn-id: http://lm-sensors.org/svn/i2c-tools/trunk@5700 7894878c-1315-0410-8ee3-d5d059ff63e0
tags/v3.0.3
Jean Delvare 17 years ago
parent
commit
ad86273e30
  1. 41
      eeprom/decode-dimms

41
eeprom/decode-dimms

@ -349,16 +349,21 @@ sub cas_latencies(@)
# Real printing functions
sub html_encode($)
{
my $text = shift;
$text =~ s/</\&lt;/sg;
$text =~ s/>/\&gt;/sg;
$text =~ s/\n/<br>\n/sg;
return $text;
}
sub real_printl($$) # print a line w/ label and value
{
my ($label, $value) = @_;
if ($opt_html) {
$label =~ s/</\&lt;/sg;
$label =~ s/>/\&gt;/sg;
$label =~ s/\n/<br>\n/sg;
$value =~ s/</\&lt;/sg;
$value =~ s/>/\&gt;/sg;
$value =~ s/\n/<br>\n/sg;
$label = html_encode($label);
$value = html_encode($value);
print "<tr><td valign=top>$label</td><td>$value</td></tr>\n";
} else {
my @values = split /\n/, $value;
@ -371,12 +376,8 @@ sub printl2($$) # print a line w/ label and value (outside a table)
{
my ($label, $value) = @_;
if ($opt_html) {
$label =~ s/</\&lt;/sg;
$label =~ s/>/\&gt;/sg;
$label =~ s/\n/<br>\n/sg;
$value =~ s/</\&lt;/sg;
$value =~ s/>/\&gt;/sg;
$value =~ s/\n/<br>\n/sg;
$label = html_encode($label);
$value = html_encode($value);
}
print "$label: $value\n";
}
@ -385,9 +386,7 @@ sub real_prints($) # print separator w/ given text
{
my ($label) = @_;
if ($opt_html) {
$label =~ s/</\&lt;/sg;
$label =~ s/>/\&gt;/sg;
$label =~ s/\n/<br>\n/sg;
$label = html_encode($label);
print "<tr><td align=center colspan=2><b>$label</b></td></tr>\n";
} else {
print "\n---=== $label ===---\n";
@ -398,12 +397,8 @@ sub printh($$) # print header w/ given text
{
my ($header, $sub) = @_;
if ($opt_html) {
$header =~ s/</\&lt;/sg;
$header =~ s/>/\&gt;/sg;
$header =~ s/\n/<br>\n/sg;
$sub =~ s/</\&lt;/sg;
$sub =~ s/>/\&gt;/sg;
$sub =~ s/\n/<br>\n/sg;
$header = html_encode($header);
$sub = html_encode($sub);
print "<h1>$header</h1>\n";
print "<p>$sub</p>\n";
} else {
@ -415,9 +410,7 @@ sub printc($) # print comment
{
my ($comment) = @_;
if ($opt_html) {
$comment =~ s/</\&lt;/sg;
$comment =~ s/>/\&gt;/sg;
$comment =~ s/\n/<br>\n/sg;
$comment = html_encode($comment);
print "<!-- $comment -->\n";
} else {
print "# $comment\n";

Loading…
Cancel
Save