Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: apache-cvs@apache.org
Date: 2 Mar 2000 11:05:18 -0000
Message-ID: <20000302110518.54133.qmail@locus.apache.org>
From: dgaudet@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/modules/mpm/prefork prefork.c

dgaudet     00/03/02 03:05:17

  Modified:    src      README.MPM
               src/include ap_iol.h
               src/main http_log.c http_protocol.c util.c
               src/modules/mpm/prefork prefork.c
  Log:
  clean up a bunch of -Wall/etc warnings
  
  Revision  Changes    Path
  1.3       +4 -0      apache-2.0/src/README.MPM
  
  Index: README.MPM
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/README.MPM,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- README.MPM	2000/03/02 07:50:02	1.2
  +++ README.MPM	2000/03/02 11:05:15	1.3
  @@ -7,3 +7,7 @@
   make
   
   Read ./configure --help for more command line options
  +
  +For full -Wall debugging do this instead:
  +
  +env USE_MAINTAINER_MODE=yes ./configure --with-debug [--other-foo]
  
  
  
  1.12      +1 -1      apache-2.0/src/include/ap_iol.h
  
  Index: ap_iol.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_iol.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ap_iol.h	2000/02/21 16:41:38	1.11
  +++ ap_iol.h	2000/03/02 11:05:15	1.12
  @@ -106,7 +106,7 @@
       ap_status_t (*close)(ap_iol *fd);
       ap_status_t (*write)(ap_iol *fd, const char *buf, ap_size_t len,
                            ap_ssize_t *nbytes);
  -    ap_status_t (*writev)(ap_iol *fd, const struct iovec *vec, int nvec,
  +    ap_status_t (*writev)(ap_iol *fd, const struct iovec *vec, ap_size_t nvec,
                             ap_ssize_t *nbytes);
       ap_status_t (*read)(ap_iol *fd, char *buf, ap_size_t len,
                           ap_ssize_t *nbytes);
  
  
  
  1.32      +1 -0      apache-2.0/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- http_log.c	2000/02/18 14:18:11	1.31
  +++ http_log.c	2000/03/02 11:05:16	1.32
  @@ -67,6 +67,7 @@
   #include "ap_config.h"
   #include "apr_lib.h"
   #include "apr_portable.h"
  +#include "apr_config.h"		/* XXX for ap_signal?? */
   #include "httpd.h"
   #include "http_config.h"
   #include "http_core.h"
  
  
  
  1.54      +1 -1      apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- http_protocol.c	2000/01/31 19:21:37	1.53
  +++ http_protocol.c	2000/03/02 11:05:16	1.54
  @@ -2015,10 +2015,10 @@
    */
   API_EXPORT(long) ap_send_fd(ap_file_t *fd, request_rec *r)
   {
  -    ap_status_t rv;
       long len = r->finfo.size;
   #ifdef HAVE_SENDFILE
       if (!r->chunked) {
  +	ap_status_t rv;
           ap_bsetopt(r->connection->client, BO_TIMEOUT,
                      r->connection->keptalive
                      ? &r->server->keep_alive_timeout
  
  
  
  1.31      +1 -0      apache-2.0/src/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- util.c	2000/02/10 13:24:11	1.30
  +++ util.c	2000/03/02 11:05:16	1.31
  @@ -71,6 +71,7 @@
   #define CORE_PRIVATE
   
   #include "ap_config.h"
  +#include "ap.h"
   #include "httpd.h"
   #include "http_main.h"
   #include "http_log.h"
  
  
  
  1.68      +4 -2      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- prefork.c	2000/02/10 23:46:33	1.67
  +++ prefork.c	2000/03/02 11:05:17	1.68
  @@ -89,6 +89,7 @@
   
   #include "ap_config.h"
   #include "apr_portable.h"
  +#include "apr_config.h"		/* XXX: for ap_signal?? */
   #include "httpd.h"
   #include "mpm_default.h"
   #include "mpm_status.h"
  @@ -909,9 +910,10 @@
   
   static ap_status_t cleanup_shared_mem(void *d)
   {
  -    mm_free(scoreboard_shm, ap_scoreboard_image);
  +    ap_shm_free(scoreboard_shm, ap_scoreboard_image);
       ap_scoreboard_image = NULL;
       ap_shm_destroy(scoreboard_shm);
  +    return APR_SUCCESS;
   }
   
   static void setup_shared_mem(ap_context_t *p)
  @@ -1379,7 +1381,7 @@
   	return;
       }
       restart_pending = 1;
  -    if (is_graceful = sig == SIGUSR1) {
  +    if ((is_graceful = (sig == SIGUSR1))) {
           ap_kill_cleanup(pconf, NULL, cleanup_shared_mem);
       }
   }