Merge OPENSSL_NO_EC{DH,DSA} into OPENSSL_NO_EC

[openssl.git] / util / ck_errf.pl

diff --git a/util/ck_errf.pl b/util/ck_errf.pl
index fd6becc423f0a33149e089fc27adc3b7a7754b8a..1a8665ab6a1b45976baeb7287c58be64e91ed1a9 100755 (executable)
--- a/util/ck_errf.pl
+++ b/util/ck_errf.pl
@@ -7,13 +7,21 @@
 # perl util/ck_errf.pl */*.c */*/*.c
 #
 
+my $err_strict = 0;
+my $bad = 0;
+
 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]+)\(.*[),]/)
+               if (!/;$/ && /^\**([a-zA-Z].*[\s*])?([A-Za-z_0-9]+)\(.*([),]|$)/)
                        {
                        /^([^()]*(\([^()]*\)[^()]*)*)\(/;
                        $1 =~ /([A-Za-z_0-9]*)$/;
@@ -26,7 +34,7 @@ foreach $file (@ARGV)
                        $n=$2;
 
                        if ($func eq "")
-                               { print "$file:$.:???:$n\n"; next; }
+                               { print "$file:$.:???:$n\n"; $bad = 1; next; }
 
                        if ($n !~ /([^_]+)_F_(.+)$/)
                                {
@@ -37,14 +45,20 @@ foreach $file (@ARGV)
                        $n=$2;
 
                        if ($lib ne $errlib)
-                               { print "$file:$.:$func:$n [${errlib}err]\n"; next; }
+                               { 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"; next; }
+                               { print "$file:$.:$func:$n\n"; $bad = 1; next; }
        #               print "$func:$1\n";
                        }
                }
        close(IN);
         }
 
+if ($bad && $err_strict)
+       {
+       print STDERR "FATAL: error discrepancy\n";
+       exit 1;
+       }
+