Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 3 Feb 2002 06:28:52 -0000
Message-ID: <20020203062852.88277.qmail@icarus.apache.org>
From: stoddard@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/experimental cache_util.c

stoddard    02/02/02 22:28:52

  Modified:    modules/experimental cache_util.c
  Log:
  Some coding style tweaks. No function change.
  
  Revision  Changes    Path
  1.7       +13 -18    httpd-2.0/modules/experimental/cache_util.c
  
  Index: cache_util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/cache_util.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- cache_util.c	3 Feb 2002 06:24:55 -0000	1.6
  +++ cache_util.c	3 Feb 2002 06:28:52 -0000	1.7
  @@ -207,7 +207,6 @@
           return apr_pstrndup(p, list, i);
       else
           return NULL;
  -
   }
   
   /*
  @@ -282,7 +281,7 @@
       char * temp;
   
       if(!info->hdrsfile) {
  -	return APR_NOTFOUND;
  +        return APR_NOTFOUND;
       }
   
       /* read the data from the cache file */
  @@ -291,16 +290,14 @@
        * dates are stored as hex seconds since 1970
        */
       rv = apr_file_gets(&urlbuff[0], urllen, fd);
  -    if (rv != APR_SUCCESS)
  -    {
  -	return rv;
  +    if (rv != APR_SUCCESS) {
  +        return rv;
       }
   
       if ((temp = strchr(&urlbuff[0], '\n')) != NULL) /* trim off new line character */
  -	*temp = '\0';      /* overlay it with the null terminator */
  +        *temp = '\0';      /* overlay it with the null terminator */
   
  -    if (!apr_date_checkmask(urlbuff, "&&&&&&&&&&&&&&&& &&&&&&&&&&&&&&&& &&&&&&&&&&&&&&&&"))
  -    {
  +    if (!apr_date_checkmask(urlbuff, "&&&&&&&&&&&&&&&& &&&&&&&&&&&&&&&& &&&&&&&&&&&&&&&&")) {
           return APR_EGENERAL;
       }
   
  @@ -312,20 +309,18 @@
       
       /* check that we have the same URL */
       rv = apr_file_gets(&urlbuff[0], urllen, fd);
  -    if (rv != APR_SUCCESS)
  -    {
  -	return rv;
  +    if (rv != APR_SUCCESS) {
  +        return rv;
       }
   
  -    if ((temp = strchr(&urlbuff[0], '\n')) != NULL) /* trim off new line character */
  -	*temp = '\0';      /* overlay it with the null terminator */
  +    if ((temp = strchr(&urlbuff[0], '\n')) != NULL) { /* trim off new line character */
  +        *temp = '\0';      /* overlay it with the null terminator */
  +    }
   
  -    if (strncmp(urlbuff, "X-NAME: ", 7) != 0)
  -    {
  -	return APR_EGENERAL;
  +    if (strncmp(urlbuff, "X-NAME: ", 7) != 0) {
  +        return APR_EGENERAL;
       }
  -    if (strcmp(urlbuff + 8, info->name) != 0)
  -    {
  +    if (strcmp(urlbuff + 8, info->name) != 0) {
           return APR_EGENERAL;
       }