projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update default dependency flags.
[openssl.git]
/
util
/
ck_errf.pl
diff --git
a/util/ck_errf.pl
b/util/ck_errf.pl
index 3af91744c5f2bfee1f5f5651c08ea23b905879d8..f13af5c50b4ec80095dbdb82970cdea3cb41bf8f 100755
(executable)
--- a/
util/ck_errf.pl
+++ b/
util/ck_errf.pl
@@
-7,22
+7,35
@@
# perl util/ck_errf.pl */*.c */*/*.c
#
# perl util/ck_errf.pl */*.c */*/*.c
#
+my $err_strict = 0;
+my $bad = 0;
+
foreach $file (@ARGV)
{
foreach $file (@ARGV)
{
+ if ($file eq "-strict")
+ {
+ $err_strict = 1;
+ next;
+ }
open(IN,"<$file") || die "unable to open $file\n";
$func="";
while (<IN>)
{
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]+)\(.*[),]
/)
{
{
- $func=$1;
+ /^([^()]*(\([^()]*\)[^()]*)*)\(/;
+ $1 =~ /([A-Za-z_0-9]*)$/;
+ $func = $1;
$func =~ tr/A-Z/a-z/;
}
$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;
$errlib=$1;
$n=$2;
+
+ if ($func eq "")
+ { print "$file:$.:???:$n\n"; $bad = 1; next; }
+
if ($n !~ /([^_]+)_F_(.+)$/)
{
# print "check -$file:$.:$func:$n\n";
if ($n !~ /([^_]+)_F_(.+)$/)
{
# print "check -$file:$.:$func:$n\n";
@@
-32,13
+45,20
@@
foreach $file (@ARGV)
$n=$2;
if ($lib ne $errlib)
$n=$2;
if ($lib ne $errlib)
- { print "$file:$.:$func:$n
\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"))
$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";
}
}
# print "$func:$1\n";
}
}
+ close(IN);
}
}
+if ($bad && $err_strict)
+ {
+ print STDERR "FATAL: error discrepancy\n";
+ exit 1;
+ }
+