Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 28 May 2001 15:50:28 -0000
Message-ID: <20010528155028.79033.qmail@apache.org>
From: ben@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/metadata mod_expires.c

ben         01/05/28 08:50:28

  Modified:    modules/metadata mod_expires.c
  Log:
  Remove many redundant semicolons.
  
  Revision  Changes    Path
  1.33      +13 -13    httpd-2.0/modules/metadata/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_expires.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- mod_expires.c	2001/05/28 15:49:17	1.32
  +++ mod_expires.c	2001/05/28 15:50:27	1.33
  @@ -242,7 +242,7 @@
       dir_config->active = ACTIVE_ON;
       if (arg == 0) {
           dir_config->active = ACTIVE_OFF;
  -    };
  +    }
       return NULL;
   }
   
  @@ -263,7 +263,7 @@
       if ((code[0] == 'A') || (code[0] == 'M')) {
           *real_code = (char *)code;
           return NULL;
  -    };
  +    }
   
       /* <base> [plus] {<num> <type>}*
        */
  @@ -281,14 +281,14 @@
       else {
           return apr_pstrcat(p, "bad expires code, unrecognised <base> '",
                          word, "'", NULL);
  -    };
  +    }
   
       /* [plus]
        */
       word = ap_getword_conf(p, &code);
       if (!strncasecmp(word, "plus", 1)) {
           word = ap_getword_conf(p, &code);
  -    };
  +    }
   
       /* {<num> <type>}*
        */
  @@ -301,7 +301,7 @@
           else {
               return apr_pstrcat(p, "bad expires code, numeric value expected <num> '",
                              word, "'", NULL);
  -        };
  +        }
   
           /* <type>
            */
  @@ -311,7 +311,7 @@
           }
           else {
               return apr_pstrcat(p, "bad expires code, missing <type>", NULL);
  -        };
  +        }
   
           factor = 0;
           if (!strncasecmp(word, "years", 1)) {
  @@ -338,14 +338,14 @@
           else {
               return apr_pstrcat(p, "bad expires code, unrecognised <type>",
                              "'", word, "'", NULL);
  -        };
  +        }
   
           modifier = modifier + factor * num;
   
           /* next <num>
            */
           word = ap_getword_conf(p, &code);
  -    };
  +    }
   
       *real_code = apr_psprintf(p, "%c%d", base, modifier);
   
  @@ -361,7 +361,7 @@
       if ((response = check_code(cmd->pool, code, &real_code)) == NULL) {
           apr_table_setn(dir_config->expiresbytype, mime, real_code);
           return NULL;
  -    };
  +    }
       return apr_pstrcat(cmd->pool,
                    "'ExpiresByType ", mime, " ", code, "': ", response, NULL);
   }
  @@ -375,7 +375,7 @@
       if ((response = check_code(cmd->pool, code, &real_code)) == NULL) {
           dir_config->expiresdefault = real_code;
           return NULL;
  -    };
  +    }
       return apr_pstrcat(cmd->pool,
                      "'ExpiresDefault ", code, "': ", response, NULL);
   }
  @@ -436,7 +436,7 @@
           ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
                       "internal error: %s", r->filename);
           return HTTP_INTERNAL_SERVER_ERROR;
  -    };
  +    }
   
       if (conf->active != ACTIVE_ON)
           return DECLINED;
  @@ -464,7 +464,7 @@
   
           if (code[0] == '\0')
               return OK;
  -    };
  +    }
   
       /* we have our code */
   
  @@ -493,7 +493,7 @@
           ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
                       "internal error: bad expires code: %s", r->filename);
           return HTTP_INTERNAL_SERVER_ERROR;
  -    };
  +    }
   
       expires = base + additional;
       apr_table_mergen(r->headers_out, "Cache-Control",