[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  cc373a37a193dbd00be20fc358b03403338ff873 (commit)
      from  45bf87a0b985c79c4fe84722df7e3f50cde00dae (commit)


- Log -----------------------------------------------------------------
commit cc373a37a193dbd00be20fc358b03403338ff873
Author: Rich Salz <rsalz at akamai.com>
Date:   Thu Jan 28 14:17:19 2016 -0500

    Remove extraneous output from util/mk scripts
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 util/mkdef.pl | 21 +++++++++------------
 util/mkerr.pl |  1 -
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 097d252..3151800 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -1028,7 +1028,8 @@ sub reduce_platforms
 	return $ret;
 }
 
-sub info_string {
+sub info_string
+{
 	(my $symbol, my $exist, my $platforms, my $kind, my $algorithms) = @_;
 
 	my %a = defined($algorithms) ?
@@ -1046,13 +1047,13 @@ sub info_string {
 	return $ret;
 }
 
-sub maybe_add_info {
+sub maybe_add_info
+{
 	(my $name, *nums, my @symbols) = @_;
 	my $sym;
 	my $new_info = 0;
 	my %syms=();
 
-	print STDERR "Updating $name info\n";
 	foreach $sym (@symbols) {
 		(my $s, my $i) = split /\\/, $sym;
 		if (defined($nums{$s})) {
@@ -1076,12 +1077,11 @@ sub maybe_add_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) {
 			print STDERR "You should do a rewrite to fix this.\n";
 		}
 	} 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};
 }
 
@@ -1431,8 +1432,6 @@ sub rewrite_numbers
 	(*OUT,$name,*nums, at symbols)=@_;
 	my $thing;
 
-	print STDERR "Rewriting $name\n";
-
 	my @r = grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:\w+\(\w+\)/, at symbols);
 	my $r; my %r; my %rsyms;
 	foreach $r (@r) {
@@ -1481,8 +1480,6 @@ sub update_numbers
 
 	($basevers, $vers) = get_openssl_version();
 
-	print STDERR "Updating $name numbers\n";
-
 	my @r = grep(/^\w+(\{[0-9]+\})?\\.*?:.*?:\w+\(\w+\)/, at symbols);
 	my $r; my %r; my %rsyms;
 	foreach $r (@r) {
@@ -1512,9 +1509,9 @@ sub update_numbers
 		}
 	}
 	if($new_syms) {
-		print STDERR "$new_syms New symbols added\n";
+		print STDERR "$name: Added $new_syms new symbols\n";
 	} else {
-		print STDERR "No New symbols Added\n";
+		print STDERR "$name: No new symbols added\n";
 	}
 }
 
diff --git a/util/mkerr.pl b/util/mkerr.pl
index 4b41c6c..7e84de9 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -384,7 +384,6 @@ foreach $lib (keys %csrc)
 	my $hfile = $hinc{$lib};
 	my $cfile = $csrc{$lib};
 	if(!$fnew{$lib} && !$rnew{$lib}) {
-		print STDERR "$lib:\t\tNo new error codes\n";
 		next unless $rebuild;
 	} else {
 		print STDERR "$lib:\t\t$fnew{$lib} New Functions,";