Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@perl.apache.org
Date: 14 Aug 2002 14:54:47 -0000
Message-ID: <20020814145447.9785.qmail@icarus.apache.org>
From: stas@apache.org
To: modperl-2.0-cvs@apache.org
Subject: cvs commit: modperl-2.0/xs/Apache/RequestIO Apache__RequestIO.h

stas        2002/08/14 07:54:47

  Modified:    src/modules/perl modperl_filter.c modperl_log.h
               t/response/TestAPI aplog.pm
               xs/Apache/Log Apache__Log.h
               xs/Apache/RequestIO Apache__RequestIO.h
  Log:
  eliminate the use of the deprecated APLOG_NOERRNO macro
  
  Revision  Changes    Path
  1.37      +1 -1      modperl-2.0/src/modules/perl/modperl_filter.c
  
  Index: modperl_filter.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- modperl_filter.c	29 Jun 2002 20:38:33 -0000	1.36
  +++ modperl_filter.c	14 Aug 2002 14:54:47 -0000	1.37
  @@ -18,7 +18,7 @@
               return APR_SUCCESS; /* XXX: HTTP_MOVED_TEMPORARILY ? */
           }
           else if (status != OK) {
  -            ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO,
  +            ap_log_error(APLOG_MARK, APLOG_WARNING,
                            0, r->server, "%s did not send an HTTP header",
                            r->uri);
           }
  
  
  
  1.10      +5 -5      modperl-2.0/src/modules/perl/modperl_log.h
  
  Index: modperl_log.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_log.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- modperl_log.h	21 Jun 2002 20:30:27 -0000	1.9
  +++ modperl_log.h	14 Aug 2002 14:54:47 -0000	1.10
  @@ -39,19 +39,19 @@
   void modperl_trace_level_set(server_rec *s, const char *level);
   
   #define modperl_log_warn(s,msg) \
  -    ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, s, "%s", msg)
  +    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "%s", msg)
   
   #define modperl_log_error(s,msg) \
  -    ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, "%s", msg)
  +    ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "%s", msg)
   
   #define modperl_log_notice(s,msg) \
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s, "%s", msg)
  +    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, "%s", msg)
   
   #define modperl_log_debug(s,msg) \
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, 0, s, "%s", msg)
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "%s", msg)
   
   #define modperl_log_reason(r,msg,file) \
  -    ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r->server, \
  +    ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, \
                    "access to %s failed for %s, reason: %s", \
                    file, \
                    get_remote_host(r->connection, \
  
  
  
  1.9       +1 -1      modperl-2.0/t/response/TestAPI/aplog.pm
  
  Index: aplog.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/aplog.pm,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- aplog.pm	4 Jun 2002 13:04:47 -0000	1.8
  +++ aplog.pm	14 Aug 2002 14:54:47 -0000	1.9
  @@ -46,7 +46,7 @@
       $s->log_serror(Apache::LOG_MARK, Apache::LOG_DEBUG,
                      APR::ENOTIME, "log_serror test 2 ok");
   
  -    $r->log_rerror(Apache::LOG_MARK, Apache::LOG_DEBUG|Apache::LOG_NOERRNO,
  +    $r->log_rerror(Apache::LOG_MARK, Apache::LOG_DEBUG,
                      APR::ENOTIME, "log_rerror test ok");
   
       $r->log_error('$r->log_error test ok');
  
  
  
  1.11      +2 -2      modperl-2.0/xs/Apache/Log/Apache__Log.h
  
  Index: Apache__Log.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/Apache/Log/Apache__Log.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Apache__Log.h	19 Jun 2002 05:18:04 -0000	1.10
  +++ Apache__Log.h	14 Aug 2002 14:54:47 -0000	1.11
  @@ -57,10 +57,10 @@
       }
   
       if (r) {
  -        ap_log_rerror(file, line, APLOG_NOERRNO|level, 0, r, "%s", str);
  +        ap_log_rerror(file, line, level, 0, r, "%s", str);
       }
       else {
  -        ap_log_error(file, line, APLOG_NOERRNO|level, 0, s, "%s", str);
  +        ap_log_error(file, line, level, 0, s, "%s", str);
       }
   
       if (svstr) {
  
  
  
  1.28      +1 -2      modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h
  
  Index: Apache__RequestIO.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Apache__RequestIO.h	30 May 2002 02:33:48 -0000	1.27
  +++ Apache__RequestIO.h	14 Aug 2002 14:54:47 -0000	1.28
  @@ -157,8 +157,7 @@
   
           /* only do this once per-request */
           if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR)) != OK) {
  -            ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0,
  -                         r->server,
  +            ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                            "mod_perl: ap_setup_client_block failed: %d", rc);
               return rc;
           }