generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove extraneous output from util/mk scripts

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2016-01-28 14:17:19 -05:00 committed by Rich Salz
parent 45bf87a0b9
commit cc373a37a1
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
util/mkdef.pl
View File

@ -1028,7 +1028,8 @@ sub reduce_platforms
return $ret; return $ret;
} }
sub info_string { sub info_string
{
(my $symbol, my $exist, my $platforms, my $kind, my $algorithms) = @_; (my $symbol, my $exist, my $platforms, my $kind, my $algorithms) = @_;
my %a = defined($algorithms) ? my %a = defined($algorithms) ?
@ -1046,13 +1047,13 @@ sub info_string {
return $ret; return $ret;
} }
sub maybe_add_info { sub maybe_add_info
{
(my $name, *nums, my @symbols) = @_; (my $name, *nums, my @symbols) = @_;
my $sym; my $sym;
my $new_info = 0; my $new_info = 0;
my %syms=(); my %syms=();
print STDERR "Updating $name info\n";
foreach $sym (@symbols) { foreach $sym (@symbols) {
(my $s, my $i) = split /\\/, $sym; (my $s, my $i) = split /\\/, $sym;
if (defined($nums{$s})) { if (defined($nums{$s})) {
@ -1076,12 +1077,11 @@ sub maybe_add_info {
} }
} }
if ($new_info) { if ($new_info) {
print STDERR "$new_info old symbols got an info update\n"; print STDERR "$name: $new_info old symbols have updated info\n";
if (!$do_rewrite) { if (!$do_rewrite) {
print STDERR "You should do a rewrite to fix this.\n"; print STDERR "You should do a rewrite to fix this.\n";
} }
} else { } else {
print STDERR "No old symbols needed info update\n";
} }
} }
@ -1171,7 +1171,8 @@ sub print_test_file
} }
} }
sub get_version { sub get_version
{
return $config{version}; return $config{version};
} }
@ -1431,8 +1432,6 @@ sub rewrite_numbers
(*OUT,$name,*nums,@symbols)=@_; (*OUT,$name,*nums,@symbols)=@_;
my $thing; my $thing;
print STDERR "Rewriting $name\n";
my @r = grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:\w+\(\w+\)/,@symbols); my @r = grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:\w+\(\w+\)/,@symbols);
my $r; my %r; my %rsyms; my $r; my %r; my %rsyms;
foreach $r (@r) { foreach $r (@r) {
@ -1481,8 +1480,6 @@ sub update_numbers
($basevers, $vers) = get_openssl_version(); ($basevers, $vers) = get_openssl_version();
print STDERR "Updating $name numbers\n";
my @r = grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:\w+\(\w+\)/,@symbols); my @r = grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:\w+\(\w+\)/,@symbols);
my $r; my %r; my %rsyms; my $r; my %r; my %rsyms;
foreach $r (@r) { foreach $r (@r) {
@ -1512,9 +1509,9 @@ sub update_numbers
} }
} }
if($new_syms) { if($new_syms) {
print STDERR "$new_syms New symbols added\n"; print STDERR "$name: Added $new_syms new symbols\n";
} else { } else {
print STDERR "No New symbols Added\n"; print STDERR "$name: No new symbols added\n";
} }
} }

1
util/mkerr.pl
View File

@ -384,7 +384,6 @@ foreach $lib (keys %csrc)
my $hfile = $hinc{$lib}; my $hfile = $hinc{$lib};
my $cfile = $csrc{$lib}; my $cfile = $csrc{$lib};
if(!$fnew{$lib} && !$rnew{$lib}) { if(!$fnew{$lib} && !$rnew{$lib}) {
print STDERR "$lib:\t\tNo new error codes\n";
next unless $rebuild; next unless $rebuild;
} else { } else {
print STDERR "$lib:\t\t$fnew{$lib} New Functions,"; print STDERR "$lib:\t\t$fnew{$lib} New Functions,";