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

Perl cleanup: don't create lists unnecessarily

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-04-06 15:02:57 +02:00
parent 1c9f511793
commit 2110febb11
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Configurations/common.tmpl
View File

@ -96,12 +96,16 @@
@{$unified_info{shared_sources}->{$lib}}) ], @{$unified_info{shared_sources}->{$lib}}) ],
deps => [ reducedepends(resolvedepends($lib)) ], deps => [ reducedepends(resolvedepends($lib)) ],
%ordinals); %ordinals);
map { doobj($_, $lib, intent => "lib") } @{$unified_info{shared_sources}->{$lib}}; foreach (@{$unified_info{shared_sources}->{$lib}}) {
doobj($_, $lib, intent => "lib");
}
} }
$OUT .= obj2lib(lib => $lib, $OUT .= obj2lib(lib => $lib,
objs => [ map { (my $x = $_) =~ s|\.o$||; $x } objs => [ map { (my $x = $_) =~ s|\.o$||; $x }
@{$unified_info{sources}->{$lib}} ]); @{$unified_info{sources}->{$lib}} ]);
map { doobj($_, $lib, intent => "lib") } @{$unified_info{sources}->{$lib}}; foreach (@{$unified_info{sources}->{$lib}}) {
doobj($_, $lib, intent => "lib");
}
$cache{$lib} = 1; $cache{$lib} = 1;
} }
@ -116,8 +120,10 @@
(@{$unified_info{sources}->{$lib}}, (@{$unified_info{sources}->{$lib}},
@{$unified_info{shared_sources}->{$lib}}) ], @{$unified_info{shared_sources}->{$lib}}) ],
deps => [ resolvedepends($lib) ]); deps => [ resolvedepends($lib) ]);
map { doobj($_, $lib, intent => "dso") } (@{$unified_info{sources}->{$lib}}, foreach ((@{$unified_info{sources}->{$lib}},
@{$unified_info{shared_sources}->{$lib}}); @{$unified_info{shared_sources}->{$lib}})) {
doobj($_, $lib, intent => "dso");
}
$cache{$lib} = 1; $cache{$lib} = 1;
} }
@ -131,7 +137,9 @@
objs => [ map { (my $x = $_) =~ s|\.o$||; $x } objs => [ map { (my $x = $_) =~ s|\.o$||; $x }
@{$unified_info{sources}->{$bin}} ], @{$unified_info{sources}->{$bin}} ],
deps => $deps); deps => $deps);
map { doobj($_, $bin, intent => "bin") } @{$unified_info{sources}->{$bin}}; foreach (@{$unified_info{sources}->{$bin}}) {
doobj($_, $bin, intent => "bin");
}
$cache{$bin} = 1; $cache{$bin} = 1;
} }
@ -150,12 +158,12 @@
# Build all known libraries, engines, programs and scripts. # Build all known libraries, engines, programs and scripts.
# Everything else will be handled as a consequence. # Everything else will be handled as a consequence.
map { dolib($_) } @{$unified_info{libraries}}; dolib($_) foreach @{$unified_info{libraries}};
map { doengine($_) } @{$unified_info{engines}}; doengine($_) foreach @{$unified_info{engines}};
map { dobin($_) } @{$unified_info{programs}}; dobin($_) foreach @{$unified_info{programs}};
map { doscript($_) } @{$unified_info{scripts}}; doscript($_) foreach @{$unified_info{scripts}};
# Finally, should there be any applicable BEGINRAW/ENDRAW sections, # Finally, should there be any applicable BEGINRAW/ENDRAW sections,
# they are added here. # they are added here.
$OUT .= $_."\n" foreach(@{$unified_info{rawlines}}); $OUT .= $_."\n" foreach @{$unified_info{rawlines}};
-} -}

10
Configure
View File

@ -743,9 +743,9 @@ while (@tocheckfor) {
while (@cascade_copy) { while (@cascade_copy) {
my ($test, $descendents) = (shift @cascade_copy, shift @cascade_copy); my ($test, $descendents) = (shift @cascade_copy, shift @cascade_copy);
if (ref($test) eq "CODE" ? $test->() : defined($disabled{$test})) { if (ref($test) eq "CODE" ? $test->() : defined($disabled{$test})) {
map { foreach(grep { !defined($disabled{$_}) } @$descendents) {
$new_tocheckfor{$_} = 1; $disabled{$_} = "forced"; $new_tocheckfor{$_} = 1; $disabled{$_} = "forced";
} grep { !defined($disabled{$_}) } @$descendents; }
} }
} }
@tocheckfor = (keys %new_tocheckfor); @tocheckfor = (keys %new_tocheckfor);
@ -2128,12 +2128,12 @@ sub resolve_config {
# the config that had it. # the config that had it.
delete $inherited_config{template}; delete $inherited_config{template};
map { foreach (keys %inherited_config) {
if (!$combined_inheritance{$_}) { if (!$combined_inheritance{$_}) {
$combined_inheritance{$_} = []; $combined_inheritance{$_} = [];
} }
push @{$combined_inheritance{$_}}, $inherited_config{$_}; push @{$combined_inheritance{$_}}, $inherited_config{$_};
} keys %inherited_config; }
} }
} }
@ -2415,7 +2415,7 @@ sub quotify {
my $processor = my $processor =
defined($processors{$for}) ? $processors{$for} : sub { shift; }; defined($processors{$for}) ? $processors{$for} : sub { shift; };
map { $processor->($_); } @_; return map { $processor->($_); } @_;
} }
# collect_from_file($filename, $line_concat_cond_re, $line_concat) # collect_from_file($filename, $line_concat_cond_re, $line_concat)