From: Simon Ruderich Date: Fri, 13 Apr 2012 14:49:52 +0000 (+0200) Subject: Minor cleanup thanks to Perl::Critic. X-Git-Tag: 0.01^0 X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=d9b1d778db739a9d5b3a26aa5e43e52f9c7b569d;p=blhc%2Fblhc.git Minor cleanup thanks to Perl::Critic. --- diff --git a/bin/blhc b/bin/blhc index 5e8e018..b57f470 100755 --- a/bin/blhc +++ b/bin/blhc @@ -43,7 +43,7 @@ my $cc_regex_full = qr/ $cc_regex /x; # Regex to catch (GCC) compiler warnings. -my $warning_regex = qr/^(.+?):([0-9]+):[0-9]+: warning: (.+?) \[(.+?)\]$/; +my $warning_regex = qr/^(.+?):(\d+):\d+: warning: (.+?) \[(.+?)\]$/; # List of source file extensions which require preprocessing. my @source_preprocess_compile_cpp = ( @@ -257,14 +257,14 @@ sub error_flags { } @{$missing_flags_ref}; my $flags = join ' ', @missing_flags; - printf "%s (%s)%s %s", + printf '%s (%s)%s %s', error_color($message, 'red'), $flags, error_color(':', 'yellow'), $line; } sub error_non_verbose_build { my ($line) = @_; - printf "%s%s %s", + printf '%s%s %s', error_color('NONVERBOSE BUILD', 'red'), error_color(':', 'yellow'), $line; @@ -345,8 +345,8 @@ sub is_non_verbose_build { if (not (index($line, 'checking if you want to see long compiling messages... no') == 0 or $line =~ /^\s*\[?(?:CC|CCLD|C\+\+|CXX|CXXLD|LD|LINK)\]?\s+(.+?)$/ - or $line =~ /^\s*(?:C|c)ompiling\s+(.+?)(?:\.\.\.)?$/ - or $line =~ /^\s*(?:B|b)uilding (?:program|shared library)\s+(.+?)$/ + or $line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/ + or $line =~ /^\s*[Bb]uilding (?:program|shared library)\s+(.+?)$/ or $line =~ /^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/)) { return 0; } @@ -356,7 +356,7 @@ sub is_non_verbose_build { # C++ compiler setting. return 0 if $line =~ /^\s*C\+\+.+?:\s+(?:yes|no)\s*$/; # "Compiling" with no file name. - if ($line =~ /^\s*(?:C|c)ompiling\s+(.+?)(?:\.\.\.)?$/) { + if ($line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/) { # $file_extension_regex may need spaces around the filename. return 0 if not " $1 " =~ /$file_extension_regex/o; } @@ -644,7 +644,7 @@ foreach my $file (@ARGV) { $_ =~ s/\s+$//; $_ .= "\n"; } Text::ParseWords::parse_line(';', 1, $line); - foreach $line (@line) { + foreach my $line (@line) { if ($continuation) { $continuation = 0; @@ -683,9 +683,9 @@ foreach my $file (@ARGV) { # # `./configure` output. next if not $non_verbose - and $line =~ /^(?:checking|(?:C|c)onfigure:) /; + and $line =~ /^(?:checking|[Cc]onfigure:) /; next if $line =~ /^\s*(?:Host\s+)?(?:C(?:\+\+)?\s+)? - (?:C|c)ompiler[\s.]*:?\s+ + [Cc]ompiler[\s.]*:?\s+ /xo; next if $line =~ /^\s*(?:- )?(?:HOST_)?(?:CC|CXX)\s*=\s*$cc_regex_full\s*$/o; @@ -698,7 +698,7 @@ foreach my $file (@ARGV) { } } - close $fh; + close $fh or die $!; # Ignore arch if requested. if (scalar @option_ignore_arch > 0 and $arch) { @@ -941,22 +941,22 @@ if ($option_buildd) { my @warning; if ($statistics{preprocess_missing}) { - push @warning, sprintf "CPPFLAGS %d (of %d)", + push @warning, sprintf 'CPPFLAGS %d (of %d)', $statistics{preprocess_missing}, $statistics{preprocess}; } if ($statistics{compile_missing}) { - push @warning, sprintf "CFLAGS %d (of %d)", + push @warning, sprintf 'CFLAGS %d (of %d)', $statistics{compile_missing}, $statistics{compile}; } if ($statistics{compile_cpp_missing}) { - push @warning, sprintf "CXXFLAGS %d (of %d)", + push @warning, sprintf 'CXXFLAGS %d (of %d)', $statistics{compile_cpp_missing}, $statistics{compile_cpp}; } if ($statistics{link_missing}) { - push @warning, sprintf "LDFLAGS %d (of %d)", + push @warning, sprintf 'LDFLAGS %d (of %d)', $statistics{link_missing}, $statistics{link}; }