Mailing-List: contact test-cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: test-dev@httpd.apache.org
Date: 22 Jan 2003 21:47:38 -0000
Message-ID: <20030122214738.79853.qmail@icarus.apache.org>
From: gregames@apache.org
To: httpd-test-cvs@apache.org
Subject: cvs commit: httpd-test/specweb99/specweb99-2.0 mod_specweb99.c

gregames    2003/01/22 13:47:37

  Modified:    specweb99/specweb99-2.0 mod_specweb99.c
  Log:
  fix a compile warning that's been in there a while apparently.
  
  Revision  Changes    Path
  1.20      +4 -4      httpd-test/specweb99/specweb99-2.0/mod_specweb99.c
  
  Index: mod_specweb99.c
  ===================================================================
  RCS file: /home/cvs/httpd-test/specweb99/specweb99-2.0/mod_specweb99.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_specweb99.c	22 Jan 2003 21:30:15 -0000	1.19
  +++ mod_specweb99.c	22 Jan 2003 21:47:37 -0000	1.20
  @@ -801,7 +801,7 @@
    * customadscan                                                        *
    ***********************************************************************/
   
  -static caddr_t customadscan(request_rec *r, char *fname, apr_int16_t adid)
  +static void customadscan(request_rec *r, char *fname, apr_int16_t adid)
   {
       struct apr_finfo_t s;
       apr_status_t rv;
  @@ -816,11 +816,11 @@
       Y = apr_psprintf(r->pool, "%1d", adid % 9);
   
       if ((rv = apr_stat(&s, fname, APR_FINFO_SIZE, r->pool)) != APR_SUCCESS)
  -        return NULL;
  +        return;
   
       rv = apr_file_open(&f, fname, APR_READ, APR_OS_DEFAULT, r->pool);
       if (rv != APR_SUCCESS)
  -        return NULL;
  +        return;
   
       len = s.size;
       buf = apr_palloc(r->pool, len + 1);
  @@ -831,7 +831,7 @@
        */
       if (((rv = apr_file_read_full(f, buf, len, &l)) != APR_SUCCESS)
             || (l != len))
  -        return NULL;            /* Error on read */
  +        return;                 /* Error on read */
   
       buf[len] = '\0';            /* Null terminate it so the strstr will
                                    * halt