Update from 1.0.0-stable.

[openssl.git] / util / ck_errf.pl

diff --git a/util/ck_errf.pl b/util/ck_errf.pl
index 5bfab700c08674ea01393c038a38db4be6e295c5..fd6becc423f0a33149e089fc27adc3b7a7754b8a 100755 (executable)
--- a/util/ck_errf.pl
+++ b/util/ck_errf.pl
@@ -13,16 +13,21 @@ foreach $file (@ARGV)
        $func="";
        while (<IN>)
                {
-               if (!/;$/ && /^([a-zA-Z].+[\s*])?([A-Za-z_0-9]+)\(.*[\),]/)
+               if (!/;$/ && /^([a-zA-Z].*[\s*])?([A-Za-z_0-9]+)\(.*[),]/)
                        {
-                       $func=$2;
+                       /^([^()]*(\([^()]*\)[^()]*)*)\(/;
+                       $1 =~ /([A-Za-z_0-9]*)$/;
+                       $func = $1;
                        $func =~ tr/A-Z/a-z/;
                        }
-               if (/([A-Z0-9]+)err\(([^,]+)/)
+               if (/([A-Z0-9]+)err\(([^,]+)/ && ! /ckerr_ignore/)
                        {
-                       next if ($func eq "");
                        $errlib=$1;
                        $n=$2;
+
+                       if ($func eq "")
+                               { print "$file:$.:???:$n\n"; next; }
+
                        if ($n !~ /([^_]+)_F_(.+)$/)
                                {
                #               print "check -$file:$.:$func:$n\n";
@@ -32,7 +37,7 @@ foreach $file (@ARGV)
                        $n=$2;
 
                        if ($lib ne $errlib)
-                               { print "$file:$.:$func:$n\n"; next; }
+                               { print "$file:$.:$func:$n [${errlib}err]\n"; next; }
 
                        $n =~ tr/A-Z/a-z/;
                        if (($n ne $func) && ($errlib ne "SYS"))