From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 21 Jan 2015 15:32:54 +0000 (+0000)
Subject: Delete trailing whitespace from output.
X-Git-Tag: OpenSSL_1_0_2~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a1b20ff65456696e6e4ce6dccb276ef63f54e1e9;p=oweals%2Fopenssl.git

Delete trailing whitespace from output.

Reviewed-by: Tim Hudson <tjh@openssl.org>
---

diff --git a/util/su-filter.pl b/util/su-filter.pl
index 854644bb33..8975af64f9 100644
--- a/util/su-filter.pl
+++ b/util/su-filter.pl
@@ -21,7 +21,7 @@ while(<>) {
     if($in_su == 1) {
         if(/}(.*);/) {
             $out .= $_;
-            print $out;
+            do_output($out);
             $in_su = 0;
         } elsif(/^ *\} [^\s]+(\[\d*\])* = \{/) {
            $tststr = $1;
@@ -44,7 +44,7 @@ while(<>) {
             my @strucdata = structureData($data);
             $out .= displayData($indent, 0, \@strucdata);
             $out .= "\n$indent};\n";
-            print $out;
+            do_output($out);
             $in_su = 0;
         }
     } elsif($incomm <= 0 && /( *)(static )?(const )?(union|struct) ([^\s]+ )?\{/) {
@@ -53,7 +53,7 @@ while(<>) {
         $out = $_;
         next;
     } else {
-        print $_;
+        do_output($_);
     }
 }
 
@@ -251,3 +251,10 @@ sub displayData {
     }
     return $out;
 }
+
+sub do_output {
+    my $out = shift;
+    # Strip any trailing whitespace
+    $out =~ s/\s+\n/\n/g;
+    print $out;
+}