You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by st...@apache.org on 2003/01/18 03:04:32 UTC

cvs commit: modperl-2.0/ModPerl-Registry/lib/ModPerl RegistryCooker.pm

stas        2003/01/17 18:04:32

  Modified:    ModPerl-Registry/lib/ModPerl RegistryCooker.pm
  Log:
  apparently there is not much use for the return status of eval
  
  Revision  Changes    Path
  1.29      +3 -6      modperl-2.0/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
  
  Index: RegistryCooker.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- RegistryCooker.pm	18 Jan 2003 01:59:21 -0000	1.28
  +++ RegistryCooker.pm	18 Jan 2003 02:04:32 -0000	1.29
  @@ -64,7 +64,6 @@
   use constant MTIME     => 3;
   use constant PACKAGE   => 4;
   use constant CODE      => 5;
  -use constant STATUS    => 6;
   
   #########################################################################
   # OS specific constants
  @@ -189,15 +188,13 @@
       $self->set_script_name;
       $self->chdir_file;
   
  -    my $rc = Apache::OK;
       my $cv = \&{"$package\::handler"};
   
       my %orig_inc = %INC;
   
       { # run the code and preserve warnings setup when it's done
           no warnings;
  -        eval { $rc = $cv->($r, @_) };
  -        $self->[STATUS] = $rc;
  +        eval { $cv->($r, @_) };
           ModPerl::Global::special_list_call(END => $package);
       }
   
  @@ -212,8 +209,8 @@
   
       #XXX: $self->chdir_file("$Apache::Server::CWD/");
   
  -    if ( ($rc = $self->error_check) != Apache::OK) {
  -        return $rc;
  +    if ( (my $err_rc = $self->error_check) != Apache::OK) {
  +        return $err_rc;
       }
   
       return Apache::OK;