1 files changed, 9 insertions, 4 deletions

diff --git a/src/lib/libcrypto/util/ck_errf.pl b/src/lib/libcrypto/util/ck_errf.pl
index 7a24d6c5a2..344b422c34 100644
--- a/src/lib/libcrypto/util/ck_errf.pl
+++ b/src/lib/libcrypto/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=$1;
+                        /^([^()]*(\([^()]*\)[^()]*)*)\(/;
+                        $1 =~ /([A-Za-z_0-9]*)$/;
+                        $func = $1;
                         $func =~ tr/A-Z/a-z/;
                         }
                 if (/([A-Z0-9]+)err\(([^,]+)/)
                         {
-                        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"))