Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 20 Jun 2000 21:06:46 -0000
Message-ID: <20000620210646.12877.qmail@locus.apache.org>
From: ben@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/modules/standard mod_alias.c

ben         00/06/20 14:06:45

  Modified:    src/modules/standard mod_alias.c
  Log:
  Fix warnings.
  
  Revision  Changes    Path
  1.13      +27 -15    apache-2.0/src/modules/standard/mod_alias.c
  
  Index: mod_alias.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_alias.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_alias.c	2000/06/20 11:31:54	1.12
  +++ mod_alias.c	2000/06/20 21:06:44	1.13
  @@ -70,8 +70,8 @@
   #include "http_request.h"
   
   typedef struct {
  -    char *real;
  -    char *fake;
  +    const char *real;
  +    const char *fake;
       char *handler;
       regex_t *regexp;
       int redir_status;		/* 301, 302, 303, 410, etc */
  @@ -126,7 +126,8 @@
       return a;
   }
   
  -static const char *add_alias_internal(cmd_parms *cmd, void *dummy, char *f, char *r,
  +static const char *add_alias_internal(cmd_parms *cmd, void *dummy,
  +				      const char *f, const char *r,
   				      int use_regex)
   {
       server_rec *s = cmd->server;
  @@ -149,17 +150,20 @@
       return NULL;
   }
   
  -static const char *add_alias(cmd_parms *cmd, void *dummy, char *f, char *r)
  +static const char *add_alias(cmd_parms *cmd, void *dummy, const char *f,
  +			     const char *r)
   {
       return add_alias_internal(cmd, dummy, f, r, 0);
   }
   
  -static const char *add_alias_regex(cmd_parms *cmd, void *dummy, char *f, char *r)
  +static const char *add_alias_regex(cmd_parms *cmd, void *dummy, const char *f,
  +				   const char *r)
   {
       return add_alias_internal(cmd, dummy, f, r, 1);
   }
   
  -static const char *add_redirect_internal(cmd_parms *cmd, alias_dir_conf * dirconf,
  +static const char *add_redirect_internal(cmd_parms *cmd,
  +					 alias_dir_conf *dirconf,
   					 const char *arg1, const char *arg2, 
                                            const char *arg3, int use_regex)
   {
  @@ -169,8 +173,8 @@
       (alias_server_conf *) ap_get_module_config(s->module_config, &alias_module);
       int status = (int) (long) cmd->info;
       regex_t *r = NULL;
  -    char *f = arg2;
  -    char *url = arg3;
  +    const char *f = arg2;
  +    const char *url = arg3;
   
       if (!strcasecmp(arg1, "gone"))
   	status = HTTP_GONE;
  @@ -216,15 +220,23 @@
       return NULL;
   }
   
  -static const char *add_redirect(cmd_parms *cmd, alias_dir_conf * dirconf, 
  -                                const char *arg1, const char *arg2, const char *arg3)
  +static const char *add_redirect(cmd_parms *cmd, void *dirconf,
  +                                const char *arg1, const char *arg2,
  +				const char *arg3)
   {
       return add_redirect_internal(cmd, dirconf, arg1, arg2, arg3, 0);
   }
   
  -static const char *add_redirect_regex(cmd_parms *cmd, alias_dir_conf * dirconf,
  -				      char *arg1, char *arg2, char *arg3)
  +static const char *add_redirect2(cmd_parms *cmd, void *dirconf,
  +                                const char *arg1, const char *arg2)
   {
  +    return add_redirect_internal(cmd, dirconf, arg1, arg2, NULL, 0);
  +}
  +
  +static const char *add_redirect_regex(cmd_parms *cmd, void *dirconf,
  +				      const char *arg1, const char *arg2,
  +				      const char *arg3)
  +{
       return add_redirect_internal(cmd, dirconf, arg1, arg2, arg3, 1);
   }
   
  @@ -246,10 +258,10 @@
                      (void *) HTTP_MOVED_TEMPORARILY, OR_FILEINFO,
                      "an optional status, then a regular expression and "
                      "destination URL"),
  -    AP_INIT_TAKE2("RedirectTemp", add_redirect, (void *) HTTP_MOVED_TEMPORARILY,
  -                  OR_FILEINFO,
  +    AP_INIT_TAKE2("RedirectTemp", add_redirect2,
  +		  (void *) HTTP_MOVED_TEMPORARILY, OR_FILEINFO,
                     "a document to be redirected, then the destination URL"),
  -    AP_INIT_TAKE2("RedirectPermanent", add_redirect, 
  +    AP_INIT_TAKE2("RedirectPermanent", add_redirect2, 
                     (void *) HTTP_MOVED_PERMANENTLY, OR_FILEINFO,
                     "a document to be redirected, then the destination URL"),
       {NULL}