diff options
author | Mike DePaulo <mikedep333@gmail.com> | 2015-07-07 08:57:00 -0400 |
---|---|---|
committer | Mike DePaulo <mikedep333@gmail.com> | 2015-07-07 09:01:38 -0400 |
commit | f65ff03d106f4cfe162bfde4780426b7bbc2e4ee (patch) | |
tree | 571dd0bd95a0341fcb1817a3a17df69b1d43e3de /openssl/util/mkerr.pl | |
parent | 4241d28e545a02eb753c8f713149e20747f044b6 (diff) | |
download | vcxsrv-f65ff03d106f4cfe162bfde4780426b7bbc2e4ee.tar.gz vcxsrv-f65ff03d106f4cfe162bfde4780426b7bbc2e4ee.tar.bz2 vcxsrv-f65ff03d106f4cfe162bfde4780426b7bbc2e4ee.zip |
Update openssl: 1.0.1m -> 1.0.1o
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 8d2fdbc7e..d87c4fd22 100644 --- a/openssl/util/mkerr.pl +++ b/openssl/util/mkerr.pl @@ -534,14 +534,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 = $_; } } } |