use whitespace more consistently

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/ms/cmp.pl b/ms/cmp.pl
index 95b257fe4caa74ecf9e4a5f8784065ef2328e502..e6f8368460f27b45e6abf34f5e2356cbbf3bc2c4 100644 (file)
--- a/ms/cmp.pl
+++ b/ms/cmp.pl
@@ -10,38 +10,38 @@ binmode IN1;
 $tot=0;
 $ret=1;
 for (;;)
-       {
-       $n1=sysread(IN0,$b1,4096);
-       $n2=sysread(IN1,$b2,4096);
+{
+    $n1=sysread(IN0,$b1,4096);
+    $n2=sysread(IN1,$b2,4096);
 
-       last if ($n1 != $n2);
-       last if ($b1 ne $b2);
-       last if ($n1 < 0);
-       if ($n1 == 0)
-               {
-               $ret=0;
-               last;
-               }
-       $tot+=$n1;
-       }
+    last if ($n1 != $n2);
+    last if ($b1 ne $b2);
+    last if ($n1 < 0);
+    if ($n1 == 0)
+    {
+        $ret=0;
+        last;
+    }
+    $tot+=$n1;
+}
 
 close(IN0);
 close(IN1);
 if ($ret)
-       {
-       printf STDERR "$ARGV[0] and $ARGV[1] are different\n";
-       @a1=unpack("C*",$b1);
-       @a2=unpack("C*",$b2);
-       for ($i=0; $i<=$#a1; $i++)
-               {
-               if ($a1[$i] ne $a2[$i])
-                       {
-                       printf "%02X %02X <<\n",$a1[$i],$a2[$i];
-                       last;
-                       }
-               }
-       $nm=$tot+$n1;
-       $tot+=$i+1;
-       printf STDERR "diff at char $tot of $nm\n";
-       }
+{
+    printf STDERR "$ARGV[0] and $ARGV[1] are different\n";
+    @a1=unpack("C*",$b1);
+    @a2=unpack("C*",$b2);
+    for ($i=0; $i<=$#a1; $i++)
+    {
+        if ($a1[$i] ne $a2[$i])
+        {
+            printf "%02X %02X <<\n",$a1[$i],$a2[$i];
+            last;
+        }
+    }
+    $nm=$tot+$n1;
+    $tot+=$i+1;
+    printf STDERR "diff at char $tot of $nm\n";
+}
 exit($ret);

diff --git a/ms/segrenam.pl b/ms/segrenam.pl
index 2ab22a045944a5f6a4eb9888dc0e66f25b03d01d..7e64c8e36fc469b240ee975c8afa094b2726cf27 100644 (file)
--- a/ms/segrenam.pl
+++ b/ms/segrenam.pl
@@ -7,17 +7,17 @@ unpack("L",pack("N",1))!=1 || die "only little-endian hosts are supported";
 # first argument can specify custom suffix...
 $suffix=(@ARGV[0]=~/^\$/) ? shift(@ARGV) : "\$m";
 #################################################################
-# rename segments in COFF modules according to %map table below        #
-%map=( ".text" => "fipstx$suffix",                             #
-       ".text\$"=> "fipstx$suffix",                            #
-       ".rdata"=> "fipsrd$suffix",                             #
-       ".data" => "fipsda$suffix"      );                      #
+# rename segments in COFF modules according to %map table below #
+%map=( ".text"  => "fipstx$suffix",                             #
+       ".text\$"=> "fipstx$suffix",                             #
+       ".rdata" => "fipsrd$suffix",                             #
+       ".data"  => "fipsda$suffix" );                           #
 #################################################################
 
 # collect file list
 foreach (@ARGV) {
-    if (/\*/)  { push(@files,glob($_)); }
-    else       { push(@files,$_);       }
+    if (/\*/) { push(@files,glob($_)); }
+    else      { push(@files,$_);       }
 }
 
 use Fcntl;
@@ -33,13 +33,13 @@ foreach (@files) {
     sysread(FD,$mz,64)==64 || die "$file is too short";
     @dos_header=unpack("a2C58I",$mz);
     if (@dos_header[0] eq "MZ") {
-       $e_lfanew=pop(@dos_header);
-       sysseek(FD,$e_lfanew,SEEK_SET)  || die "$file is too short";
-       sysread(FD,$Magic,4)==4         || die "$file is too short";
-       unpack("I",$Magic)==0x4550      || die "$file is not COFF image";
+        $e_lfanew=pop(@dos_header);
+        sysseek(FD,$e_lfanew,SEEK_SET) || die "$file is too short";
+        sysread(FD,$Magic,4)==4        || die "$file is too short";
+        unpack("I",$Magic)==0x4550     || die "$file is not COFF image";
     } elsif ($file =~ /\.obj$/i) {
-       # .obj files have no IMAGE_DOS_HEADER
-       sysseek(FD,0,SEEK_SET)          || die "unable to rewind $file";
+        # .obj files have no IMAGE_DOS_HEADER
+        sysseek(FD,0,SEEK_SET)         || die "unable to rewind $file";
     } else { next; }
 
     # read IMAGE_FILE_HEADER
@@ -53,13 +53,13 @@ foreach (@files) {
 
     # traverse IMAGE_SECTION_HEADER table
     for($i=0;$i<$NumberOfSections;$i++) {
-       sysread(FD,$SectionHeader,40)==40 || die "$file is too short";
-       ($Name,@opaque)=unpack("Z8C*",$SectionHeader);
-       if ($map{$Name}) {
-           sysseek(FD,-40,SEEK_CUR) || die "unable to rewind $file";
-           syswrite(FD,pack("a8C*",$map{$Name},@opaque))==40 || die "syswrite failed: $!";
-           printf "    %-8s -> %.8s\n",$Name,$map{$Name} unless $quiet;
-       }
+        sysread(FD,$SectionHeader,40)==40 || die "$file is too short";
+        ($Name,@opaque)=unpack("Z8C*",$SectionHeader);
+        if ($map{$Name}) {
+            sysseek(FD,-40,SEEK_CUR) || die "unable to rewind $file";
+            syswrite(FD,pack("a8C*",$map{$Name},@opaque))==40 || die "syswrite failed: $!";
+            printf "    %-8s -> %.8s\n",$Name,$map{$Name} unless $quiet;
+        }
     }
     close(FD);
 }