diff options
author | marha <marha@users.sourceforge.net> | 2015-06-15 20:18:50 +0200 |
---|---|---|
committer | Mike DePaulo <mikedep333@gmail.com> | 2015-06-22 01:16:46 -0400 |
commit | 36da4a2e0e43928a29ac2ee5c55bf681e90e2f42 (patch) | |
tree | 92633e1022d705c72d0f97315891e719648dd17e /openssl/util/mkerr.pl | |
parent | bec4be4c48239613ed1c704ae71bf08754eef711 (diff) | |
download | vcxsrv-36da4a2e0e43928a29ac2ee5c55bf681e90e2f42.tar.gz vcxsrv-36da4a2e0e43928a29ac2ee5c55bf681e90e2f42.tar.bz2 vcxsrv-36da4a2e0e43928a29ac2ee5c55bf681e90e2f42.zip |
Update to openssl-1.0.2crelease/external-1.17.0.0-x
Diffstat (limited to 'openssl/util/mkerr.pl')
-rw-r--r-- | openssl/util/mkerr.pl | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/openssl/util/mkerr.pl b/openssl/util/mkerr.pl index 7b6776dda..09ebebef9 100644 --- a/openssl/util/mkerr.pl +++ b/openssl/util/mkerr.pl @@ -535,14 +535,21 @@ EOF # First, read any existing reason string definitions: my %err_reason_strings; if (open(IN,"<$cfile")) { + my $line = ""; while (<IN>) { - if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) { - $err_reason_strings{$1} = $2; - } - if (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) { - if (!exists $ftrans{$1} && ($1 ne $2)) { - print STDERR "WARNING: Mismatched function string $2\n"; - $ftrans{$1} = $2; + chomp; + $_ = $line . $_; + $line = ""; + if (/{ERR_(FUNC|REASON)\(/) { + if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) { + $err_reason_strings{$1} = $2; + } elsif (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) { + if (!exists $ftrans{$1} && ($1 ne $2)) { + print STDERR "WARNING: Mismatched function string $2\n"; + $ftrans{$1} = $2; + } + } else { + $line = $_; } } } |