summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-05-02 15:28:33 -0400
committerRich Salz <rsalz@openssl.org>2017-05-03 14:16:58 -0400
commit5038e325f70d709e2a78ba6760a79a2f3d22f990 (patch)
tree6c41f608ffee8cf1e0b4686b1642641221c36124
parentce1e11bc6f1dcea5c024b2a17626e5035beec9d2 (diff)
Perltidy ck_errf
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3368)
-rwxr-xr-xutil/ck_errf.pl99
1 files changed, 52 insertions, 47 deletions
diff --git a/util/ck_errf.pl b/util/ck_errf.pl
index 01ed905fe5..ada23523fc 100755
--- a/util/ck_errf.pl
+++ b/util/ck_errf.pl
@@ -13,58 +13,63 @@
# perl util/ck_errf.pl */*.c */*/*.c
#
+use strict;
+use warnings;
+
my $err_strict = 0;
-my $bad = 0;
+my $bad = 0;
+
+foreach my $file (@ARGV) {
+ if ( $file eq "-strict" ) {
+ $err_strict = 1;
+ next;
+ }
+ open( IN, "<$file" ) || die "Can't open $file, $!";
+ my $func = "";
+ while (<IN>) {
+ if ( !/;$/ && /^\**([a-zA-Z_].*[\s*])?([A-Za-z_0-9]+)\(.*([),]|$)/ ) {
+ /^([^()]*(\([^()]*\)[^()]*)*)\(/;
+ $1 =~ /([A-Za-z_0-9]*)$/;
+ $func = $1;
+ $func =~ tr/A-Z/a-z/;
+ }
+ if ( /([A-Z0-9]+)err\(([^,]+)/ && !/ckerr_ignore/ ) {
+ my $errlib = $1;
+ my $n = $2;
-foreach $file (@ARGV)
- {
- if ($file eq "-strict")
- {
- $err_strict = 1;
- next;
- }
- open(IN,"<$file") || die "unable to open $file\n";
- $func="";
- while (<IN>)
- {
- if (!/;$/ && /^\**([a-zA-Z_].*[\s*])?([A-Za-z_0-9]+)\(.*([),]|$)/)
- {
- /^([^()]*(\([^()]*\)[^()]*)*)\(/;
- $1 =~ /([A-Za-z_0-9]*)$/;
- $func = $1;
- $func =~ tr/A-Z/a-z/;
- }
- if (/([A-Z0-9]+)err\(([^,]+)/ && ! /ckerr_ignore/)
- {
- $errlib=$1;
- $n=$2;
+ if ( $func eq "" ) {
+ print "$file:$.:???:$n\n";
+ $bad = 1;
+ next;
+ }
- if ($func eq "")
- { print "$file:$.:???:$n\n"; $bad = 1; next; }
+ if ( $n !~ /([^_]+)_F_(.+)$/ ) {
+ #print "check -$file:$.:$func:$n\n";
+ next;
+ }
+ my $lib = $1;
+ $n = $2;
- if ($n !~ /([^_]+)_F_(.+)$/)
- {
- # print "check -$file:$.:$func:$n\n";
- next;
- }
- $lib=$1;
- $n=$2;
+ if ( $lib ne $errlib ) {
+ print "$file:$.:$func:$n [${errlib}err]\n";
+ $bad = 1;
+ next;
+ }
- if ($lib ne $errlib)
- { print "$file:$.:$func:$n [${errlib}err]\n"; $bad = 1; next; }
+ $n =~ tr/A-Z/a-z/;
+ if ( $n ne $func && $errlib ne "SYS" ) {
+ print "$file:$.:$func:$n\n";
+ $bad = 1;
+ next;
+ }
- $n =~ tr/A-Z/a-z/;
- if (($n ne $func) && ($errlib ne "SYS"))
- { print "$file:$.:$func:$n\n"; $bad = 1; next; }
- # print "$func:$1\n";
- }
- }
- close(IN);
+ # print "$func:$1\n";
}
+ }
+ close(IN);
+}
-if ($bad && $err_strict)
- {
- print STDERR "FATAL: error discrepancy\n";
- exit 1;
- }
-
+if ( $bad && $err_strict ) {
+ print STDERR "FATAL: error discrepancy\n";
+ exit 1;
+}