- From: Ville Skytta via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 26 Jan 2010 20:29:44 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/validator/httpd/cgi-bin In directory hutz:/tmp/cvs-serv28553/httpd/cgi-bin Modified Files: check Log Message: Drop dead code. Index: check =================================================================== RCS file: /sources/public/validator/httpd/cgi-bin/check,v retrieving revision 1.764 retrieving revision 1.765 diff -u -d -r1.764 -r1.765 --- check 26 Jan 2010 20:16:38 -0000 1.764 +++ check 26 Jan 2010 20:29:42 -0000 1.765 @@ -77,13 +77,6 @@ use constant T_ERROR => 8; # 0000 1000 # -# Output flags for error processing -use constant O_SOURCE => 1; # 0000 0001 -use constant O_CHARSET => 2; # 0000 0010 -use constant O_DOCTYPE => 4; # 0000 0100 -use constant O_NONE => 8; # 0000 1000 - -# # Define global variables. use vars qw($DEBUG $CFG %RSRC $VERSION); @@ -389,7 +382,7 @@ } $File->{Opt}->{Debug} = $DEBUG; -&abort_if_error_flagged($File, O_NONE); +&abort_if_error_flagged($File); # # Get the file and metadata. @@ -405,7 +398,7 @@ # # Abort if an error was flagged during initialization. -&abort_if_error_flagged($File, 0); +&abort_if_error_flagged($File); # # Get rid of the CGI object. @@ -510,7 +503,7 @@ # # Abort if an error was flagged while finding the encoding. -&abort_if_error_flagged($File, O_CHARSET | O_DOCTYPE); +&abort_if_error_flagged($File); $File->{Charset}->{Default} = FALSE; unless ($File->{Charset}->{Use}) { # No charset given... @@ -538,7 +531,7 @@ } # if it still does not work, we abandon hope here -&abort_if_error_flagged($File, O_CHARSET); +&abort_if_error_flagged($File); # # Add a warning if doc is UTF-8 and contains a BOM. @@ -826,7 +819,7 @@ else { $File = &dtd_validate($File); } -&abort_if_error_flagged($File, 0); +&abort_if_error_flagged($File); # # Force "XML" if type is an XML type and an FPI was not found. @@ -3168,8 +3161,7 @@ # Abort with a message if an error was flagged at point. sub abort_if_error_flagged { - my $File = shift; - my $Flags = shift; + my $File = shift; return unless $File->{'Error Flagged'}; return if $File->{'Error Handled'}; # Previous error, keep going. @@ -3279,13 +3271,6 @@ use constant T_WARN => 4; # 0000 0100 use constant T_ERROR => 8; # 0000 1000 -# -# Output flags for error processing -use constant O_SOURCE => 1; # 0000 0001 -use constant O_CHARSET => 2; # 0000 0010 -use constant O_DOCTYPE => 4; # 0000 0100 -use constant O_NONE => 8; # 0000 1000 - sub new { my $class = shift; @@ -3503,7 +3488,7 @@ } # TODO: calling exit() here is probably a bad idea - W3C::Validator::MarkupValidator::abort_if_error_flagged($File, O_DOCTYPE); + W3C::Validator::MarkupValidator::abort_if_error_flagged($File); push @{$File->{Errors}}, $err; @@ -3535,13 +3520,6 @@ use constant T_WARN => 4; # 0000 0100 use constant T_ERROR => 8; # 0000 1000 -# -# Output flags for error processing -use constant O_SOURCE => 1; # 0000 0001 -use constant O_CHARSET => 2; # 0000 0010 -use constant O_DOCTYPE => 4; # 0000 0100 -use constant O_NONE => 8; # 0000 1000 - use base qw(W3C::Validator::EventHandler); sub new
Received on Tuesday, 26 January 2010 20:29:46 UTC