Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 25 Jan 2002 12:04:56 -0000
Message-ID: <20020125120456.37870.qmail@icarus.apache.org>
From: trawick@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server scoreboard.c

trawick     02/01/25 04:04:56

  Modified:    server   scoreboard.c
  Log:
  axe an unused variable
  
  don't pass uninitialized rv to ap_log_error as the error code
  
  Revision  Changes    Path
  1.51      +1 -4      httpd-2.0/server/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/scoreboard.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- scoreboard.c	25 Jan 2002 07:21:40 -0000	1.50
  +++ scoreboard.c	25 Jan 2002 12:04:56 -0000	1.51
  @@ -203,14 +203,11 @@
   apr_status_t reopen_scoreboard(apr_pool_t *p, int detached)
   {
   #if APR_HAS_SHARED_MEMORY
  -    apr_status_t rv;
  -    char *fname = NULL;
  -
       if (!detached) {
           return APR_SUCCESS;
       }
       if (apr_shm_size_get(ap_scoreboard_shm) < scoreboard_size) {
  -        ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL,
  +        ap_log_error(APLOG_MARK, APLOG_CRIT | APLOG_NOERRNO, 0, NULL,
                        "Fatal error: shared scoreboard too small for child!");
           apr_shm_detach(ap_scoreboard_shm);
           ap_scoreboard_shm = NULL;