summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2016-10-10 12:01:24 -0400
committerMatt Caswell <matt@openssl.org>2016-10-10 23:36:21 +0100
commit609b0852e4d50251857dbbac3141ba042e35a9ae (patch)
treeee559ebc14734fdf2a273f845cb98d8d8f93eb7d /util
parent11542af65a82242b47e97506695fa0d306d24fb6 (diff)
Remove trailing whitespace from some files.
The prevailing style seems to not have trailing whitespace, but a few lines do. This is mostly in the perlasm files, but a few C files got them after the reformat. This is the result of: find . -name '*.pl' | xargs sed -E -i '' -e 's/( |'$'\t'')*$//' find . -name '*.c' | xargs sed -E -i '' -e 's/( |'$'\t'')*$//' find . -name '*.h' | xargs sed -E -i '' -e 's/( |'$'\t'')*$//' Then bn_prime.h was excluded since this is a generated file. Note mkerr.pl has some changes in a heredoc for some help output, but other lines there lack trailing whitespace too. Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'util')
-rwxr-xr-xutil/ck_errf.pl2
-rw-r--r--util/copy.pl4
-rw-r--r--util/fipslink.pl2
-rwxr-xr-xutil/mkdef.pl8
-rw-r--r--util/mkerr.pl16
-rw-r--r--util/su-filter.pl2
6 files changed, 17 insertions, 17 deletions
diff --git a/util/ck_errf.pl b/util/ck_errf.pl
index 7fc536786e..01ed905fe5 100755
--- a/util/ck_errf.pl
+++ b/util/ck_errf.pl
@@ -8,7 +8,7 @@
# This is just a quick script to scan for cases where the 'error'
# function name in a XXXerr() macro is wrong.
-#
+#
# Run in the top level by going
# perl util/ck_errf.pl */*.c */*/*.c
#
diff --git a/util/copy.pl b/util/copy.pl
index ef4d8708e2..c4aeea6a18 100644
--- a/util/copy.pl
+++ b/util/copy.pl
@@ -40,7 +40,7 @@ if ($fnum <= 1)
}
$dest = pop @filelist;
-
+
if ($fnum > 2 && ! -d $dest)
{
die "Destination must be a directory";
@@ -73,5 +73,5 @@ foreach (@filelist)
close(OUT);
print "Copying: $_ to $dfile\n";
}
-
+
diff --git a/util/fipslink.pl b/util/fipslink.pl
index 18a91532be..bb685bf7bd 100644
--- a/util/fipslink.pl
+++ b/util/fipslink.pl
@@ -109,7 +109,7 @@ sub check_hash
$hashval =~ s/^.*=\s+//;
die "Invalid hash syntax in file" if (length($hashfile) != 40);
die "Invalid hash received for file" if (length($hashval) != 40);
- die "***HASH VALUE MISMATCH FOR FILE $filename ***" if ($hashval ne $hashfile);
+ die "***HASH VALUE MISMATCH FOR FILE $filename ***" if ($hashval ne $hashfile);
}
diff --git a/util/mkdef.pl b/util/mkdef.pl
index b54c925c4c..764029334f 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -24,7 +24,7 @@
# existence:platform:kind:algorithms
#
# - "existence" can be "EXIST" or "NOEXIST" depending on if the symbol is
-# found somewhere in the source,
+# found somewhere in the source,
# - "platforms" is empty if it exists on all platforms, otherwise it contains
# comma-separated list of the platform, just as they are if the symbol exists
# for those platforms, or prepended with a "!" if not. This helps resolve
@@ -172,7 +172,7 @@ foreach (@ARGV, split(/ /, $config{options}))
$do_ssl=1 if $_ eq "libssl";
if ($_ eq "ssl") {
- $do_ssl=1;
+ $do_ssl=1;
$libname=$_
}
$do_crypto=1 if $_ eq "libcrypto";
@@ -211,7 +211,7 @@ foreach (@ARGV, split(/ /, $config{options}))
}
-if (!$libname) {
+if (!$libname) {
if ($do_ssl) {
$libname="LIBSSL";
}
@@ -339,7 +339,7 @@ if($do_crypto == 1) {
}
&update_numbers(*OUT,"LIBCRYPTO",*crypto_list,$max_crypto,@crypto_symbols);
close OUT;
-}
+}
} elsif ($do_checkexist) {
&check_existing(*ssl_list, @ssl_symbols)
diff --git a/util/mkerr.pl b/util/mkerr.pl
index 79c8cfc31c..4645658e99 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -97,7 +97,7 @@ Options:
Default: keep previously assigned numbers. (You are warned
when collisions are detected.)
- -nostatic Generates a different source code, where these additional
+ -nostatic Generates a different source code, where these additional
functions are generated for each library specified in the
config file:
void ERR_load_<LIB>_strings(void);
@@ -105,7 +105,7 @@ Options:
void ERR_<LIB>_error(int f, int r, char *fn, int ln);
#define <LIB>err(f,r) ERR_<LIB>_error(f,r,OPENSSL_FILE,OPENSSL_LINE)
while the code facilitates the use of these in an environment
- where the error support routines are dynamically loaded at
+ where the error support routines are dynamically loaded at
runtime.
Default: 'static' code generation.
@@ -114,8 +114,8 @@ Options:
-unref Print out unreferenced function and reason codes.
- -write Actually (over)write the generated code to the header and C
- source files as assigned to each library through the config
+ -write Actually (over)write the generated code to the header and C
+ source files as assigned to each library through the config
file.
Default: don't write.
@@ -196,7 +196,7 @@ while (($hdr, $lib) = each %libinc)
if(/\/\*/) {
if (not /\*\//) { # multiline comment...
$line = $_; # ... just accumulate
- next;
+ next;
} else {
s/\/\*.*?\*\///gs; # wipe it
}
@@ -370,7 +370,7 @@ foreach $file (@source) {
print STDERR "ERROR: mismatch $file:$linenr $func:$3\n";
$errcount++;
}
- print STDERR "Function: $1\t= $fcodes{$1} (lib: $2, name: $3)\n" if $debug;
+ print STDERR "Function: $1\t= $fcodes{$1} (lib: $2, name: $3)\n" if $debug;
}
if(/(([A-Z0-9]+)_R_[A-Z0-9_]+)/) {
next unless exists $csrc{$2};
@@ -379,8 +379,8 @@ foreach $file (@source) {
$rcodes{$1} = "X";
$rnew{$2}++;
}
- print STDERR "Reason: $1\t= $rcodes{$1} (lib: $2)\n" if $debug;
- }
+ print STDERR "Reason: $1\t= $rcodes{$1} (lib: $2)\n" if $debug;
+ }
}
close IN;
}
diff --git a/util/su-filter.pl b/util/su-filter.pl
index 5996f58225..389c7c35c5 100644
--- a/util/su-filter.pl
+++ b/util/su-filter.pl
@@ -108,7 +108,7 @@ sub structureData {
if($inbrace) {
if($item eq "}") {
$inbrace --;
-
+
if(!$inbrace) {
$substruc = structureData($dataitem);
$dataitem = $substruc;