- From: Ville Skytta via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 24 Nov 2009 18:49:53 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/validator/httpd/cgi-bin
In directory hutz:/tmp/cvs-serv19233/httpd/cgi-bin
Modified Files:
check
Log Message:
Fix perlcritic "Mixed high and low-precedence booleans" errors.
Index: check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.725
retrieving revision 1.726
diff -u -d -r1.725 -r1.726
--- check 24 Nov 2009 18:44:58 -0000 1.725
+++ check 24 Nov 2009 18:49:51 -0000 1.726
@@ -697,8 +697,8 @@
$msg_line =~ s{[^\x0d\x0a]+[\x0d\x0a]$}{};
# first we get the actual error message
- if (!$got_error_message and
- ($msg_line =~ /^(:\d+:)( parser error : .*)/))
+ if (!$got_error_message &&
+ $msg_line =~ /^(:\d+:)( parser error : .*)/)
{
$xmlwf_error_line = $1;
$xmlwf_error_msg = $2;
@@ -709,7 +709,7 @@
# then we skip the second line, which shows the context
# (we don't use that)
- elsif ($got_error_message and !$got_quoted_line) {
+ elsif ($got_error_message && !$got_quoted_line) {
$got_quoted_line = 1;
}
@@ -1520,13 +1520,12 @@
],
);
- if (!$File->{Doctype} and
- ($File->{Version} eq 'unknown' or
- $File->{Version} eq 'SGML' or
- (!$File->{Version}))
+ if (!$File->{Doctype} &&
+ (!$File->{Version} ||
+ $File->{Version} eq 'unknown' ||
+ $File->{Version} eq 'SGML')
)
{
-
my $default_doctype =
$File->{"Default DOCTYPE"}->{&is_xml($File) ? "XHTML" : "HTML"};
$T->param(file_version => "$default_doctype");
@@ -3301,7 +3300,7 @@
# add to list of non-root namespaces
push(@{$self->{_file}->{Namespaces}}, $xmlns_value) if $has_xmlns;
}
- elsif (!$has_xmlns and
+ elsif (!$has_xmlns &&
$self->{CFG}->{Types}->{$doctype}->{"Namespace Required"})
{
@@ -3615,7 +3614,7 @@
my ($self, $uri) = @_;
return 1
- if ($self->{'W3C::Validator::CFG'}->{'Allow Private IPs'} or
+ if ($self->{'W3C::Validator::CFG'}->{'Allow Private IPs'} ||
!$uri->can('host'));
my $h5uri = $self->{'W3C::Validator::CFG'}->{External}->{HTML5};
Received on Tuesday, 24 November 2009 18:49:55 UTC