X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util%2Fck_errf.pl;h=344b422c3403654cb953c3eb037b1b3f1f43ea84;hb=5abe32d8611b26630305731f7dd4ea564264719e;hp=3af91744c5f2bfee1f5f5651c08ea23b905879d8;hpb=d02b48c63a58ea4367a0e905979f140b7d090f86;p=oweals%2Fopenssl.git diff --git a/util/ck_errf.pl b/util/ck_errf.pl index 3af91744c5..344b422c34 100755 --- a/util/ck_errf.pl +++ b/util/ck_errf.pl @@ -13,16 +13,21 @@ foreach $file (@ARGV) $func=""; while () { - 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")) @@ -40,5 +45,6 @@ foreach $file (@ARGV) # print "$func:$1\n"; } } + close(IN); }