Merge remote-tracking branch 'upstream-public/pr/1493' into mbedtls-2.1-proposed

Fixes #504 and fixes #1057 for the 2.1 branch
This commit is contained in:
Jaeden Amero 2018-03-29 10:54:08 +01:00
commit d58f697472

View File

@ -46,7 +46,14 @@ close(FORMAT_FILE);
$/ = $line_separator; $/ = $line_separator;
open(GREP, "grep \"define MBEDTLS_ERR_\" $include_dir/* |") || die("Failure when calling grep: $!"); my @files = <$include_dir/*.h>;
my @matches;
foreach my $file (@files) {
open(FILE, "$file");
my @grep_res = grep(/^\s*#define\s+MBEDTLS_ERR_\w+\s+\-0x[0-9A-Fa-f]+/, <FILE>);
push(@matches, @grep_res);
close FILE;
}
my $ll_old_define = ""; my $ll_old_define = "";
my $hl_old_define = ""; my $hl_old_define = "";
@ -58,7 +65,8 @@ my $headers = "";
my %error_codes_seen; my %error_codes_seen;
while (my $line = <GREP>)
foreach my $line (@matches)
{ {
next if ($line =~ /compat-1.2.h/); next if ($line =~ /compat-1.2.h/);
my ($error_name, $error_code) = $line =~ /(MBEDTLS_ERR_\w+)\s+\-(0x\w+)/; my ($error_name, $error_code) = $line =~ /(MBEDTLS_ERR_\w+)\s+\-(0x\w+)/;