wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto-size more of configdata.pm "disabled features"

Browse source 
configdata.pm -d prints out a lot of information, including a table
of what features are disabled, why, and the effect of that disablement
(in terms of preprocessor symbols defined and directories skipped).
The first column is already auto-sized, to easily accomodate future
disableable features with long names.  Also auto-size the second column,
to accomodate future reasons for disablement with long names as well.

Failing to take such precautions results in stderr spew from
configdata.pm -d when such long reasons are in use:

   Negative repeat count does nothing at ./configdata.pm line 14504.

Such output is pretty distracting from the actual desired output,
so try to avoid it if possible.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5371)
This commit is contained in:
Benjamin Kaduk 2018-02-14 12:04:16 -06:00 committed by Benjamin Kaduk
parent 4fd39122e5
commit 0b80103bfa
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Configure
View file

@ -2379,8 +2379,10 @@ _____
} }
if ($dump || $options) { if ($dump || $options) {
my $longest = 0; my $longest = 0;
my $longest2 = 0;
foreach my $what (@disablables) { foreach my $what (@disablables) {
$longest = length($what) if $longest < length($what); $longest = length($what) if $longest < length($what);
$longest2 = length($disabled{$what}) if $longest2 < length($disabled{$what});
} }
print "\nEnabled features:\n\n"; print "\nEnabled features:\n\n";
foreach my $what (@disablables) { foreach my $what (@disablables) {
@ -2390,7 +2392,7 @@ _____
foreach my $what (@disablables) { foreach my $what (@disablables) {
if ($disabled{$what}) { if ($disabled{$what}) {
print " $what", ' ' x ($longest - length($what) + 1), print " $what", ' ' x ($longest - length($what) + 1),
"[$disabled{$what}]", ' ' x (10 - length($disabled{$what})); "[$disabled{$what}]", ' ' x ($longest2 - length($disabled{$what}) + 1);
print $disabled_info{$what}->{macro} print $disabled_info{$what}->{macro}
if $disabled_info{$what}->{macro}; if $disabled_info{$what}->{macro};
print ' (skip ', print ' (skip ',