You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by Brian Behlendorf <br...@hyperreal.com> on 1996/10/31 02:46:31 UTC
cvs commit: apache/src mod_rewrite.h mod_rewrite.c
brian 96/10/30 17:46:30
Modified: src mod_rewrite.h mod_rewrite.c
Log:
Cleaned up -Wall warnings due to constification.
Revision Changes Path
1.7 +8 -8 apache/src/mod_rewrite.h
Index: mod_rewrite.h
===================================================================
RCS file: /export/home/cvs/apache/src/mod_rewrite.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C3 -r1.6 -r1.7
*** mod_rewrite.h 1996/10/14 10:51:16 1.6
--- mod_rewrite.h 1996/10/31 01:46:26 1.7
***************
*** 291,310 ****
static void *config_perdir_merge (pool *p, void *basev, void *overridesv);
/* config directive handling */
! static char *cmd_rewriteengine (cmd_parms *cmd, rewrite_perdir_conf *dconf, int flag);
! static char *cmd_rewriteoptions (cmd_parms *cmd, rewrite_perdir_conf *dconf, char *option);
static char *cmd_rewriteoptions_setoption(pool *p, int *options, char *name);
! static char *cmd_rewritelog (cmd_parms *cmd, void *dconf, char *a1);
! static char *cmd_rewriteloglevel(cmd_parms *cmd, void *dconf, char *a1);
! static char *cmd_rewritemap (cmd_parms *cmd, void *dconf, char *a1, char *a2);
! static char *cmd_rewritebase(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *a1);
! static char *cmd_rewritecond (cmd_parms *cmd, rewrite_perdir_conf *dconf, char *str);
static char *cmd_rewritecond_parseflagfield(pool *p, rewritecond_entry *new, char *str);
static char *cmd_rewritecond_setflag (pool *p, rewritecond_entry *cfg, char *key, char *val);
! extern char *cmd_rewriterule (cmd_parms *cmd, rewrite_perdir_conf *dconf, char *str);
static char *cmd_rewriterule_parseflagfield(pool *p, rewriterule_entry *new, char *str);
static char *cmd_rewriterule_setflag (pool *p, rewriterule_entry *cfg, char *key, char *val);
--- 291,310 ----
static void *config_perdir_merge (pool *p, void *basev, void *overridesv);
/* config directive handling */
! const char *cmd_rewriteengine (cmd_parms *cmd, rewrite_perdir_conf *dconf, int flag);
! const char *cmd_rewriteoptions (cmd_parms *cmd, rewrite_perdir_conf *dconf, char *option);
static char *cmd_rewriteoptions_setoption(pool *p, int *options, char *name);
! const char *cmd_rewritelog (cmd_parms *cmd, void *dconf, char *a1);
! const char *cmd_rewriteloglevel(cmd_parms *cmd, void *dconf, char *a1);
! const char *cmd_rewritemap (cmd_parms *cmd, void *dconf, char *a1, char *a2);
! const char *cmd_rewritebase(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *a1);
! const char *cmd_rewritecond (cmd_parms *cmd, rewrite_perdir_conf *dconf, char *str);
static char *cmd_rewritecond_parseflagfield(pool *p, rewritecond_entry *new, char *str);
static char *cmd_rewritecond_setflag (pool *p, rewritecond_entry *cfg, char *key, char *val);
! const char *cmd_rewriterule (cmd_parms *cmd, rewrite_perdir_conf *dconf, char *str);
static char *cmd_rewriterule_parseflagfield(pool *p, rewriterule_entry *new, char *str);
static char *cmd_rewriterule_setflag (pool *p, rewriterule_entry *cfg, char *key, char *val);
1.6 +9 -9 apache/src/mod_rewrite.c
Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C3 -r1.5 -r1.6
*** mod_rewrite.c 1996/10/14 10:51:15 1.5
--- mod_rewrite.c 1996/10/31 01:46:28 1.6
***************
*** 349,355 ****
**
*/
! static char *cmd_rewriteengine(cmd_parms *cmd, rewrite_perdir_conf *dconf, int flag)
{
rewrite_server_conf *sconf;
--- 349,355 ----
**
*/
! const char *cmd_rewriteengine(cmd_parms *cmd, rewrite_perdir_conf *dconf, int flag)
{
rewrite_server_conf *sconf;
***************
*** 362,368 ****
return NULL;
}
! static char *cmd_rewriteoptions(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *option)
{
rewrite_server_conf *sconf;
char *err;
--- 362,368 ----
return NULL;
}
! const char *cmd_rewriteoptions(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *option)
{
rewrite_server_conf *sconf;
char *err;
***************
*** 385,391 ****
return NULL;
}
! static char *cmd_rewritelog(cmd_parms *cmd, void *dconf, char *a1)
{
rewrite_server_conf *sconf;
--- 385,391 ----
return NULL;
}
! const char *cmd_rewritelog(cmd_parms *cmd, void *dconf, char *a1)
{
rewrite_server_conf *sconf;
***************
*** 395,401 ****
return NULL;
}
! static char *cmd_rewriteloglevel(cmd_parms *cmd, void *dconf, char *a1)
{
rewrite_server_conf *sconf;
--- 395,401 ----
return NULL;
}
! const char *cmd_rewriteloglevel(cmd_parms *cmd, void *dconf, char *a1)
{
rewrite_server_conf *sconf;
***************
*** 405,411 ****
return NULL;
}
! static char *cmd_rewritemap(cmd_parms *cmd, void *dconf, char *a1, char *a2)
{
rewrite_server_conf *sconf;
rewritemap_entry *new;
--- 405,411 ----
return NULL;
}
! const char *cmd_rewritemap(cmd_parms *cmd, void *dconf, char *a1, char *a2)
{
rewrite_server_conf *sconf;
rewritemap_entry *new;
***************
*** 449,455 ****
return NULL;
}
! static char *cmd_rewritebase(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *a1)
{
if (cmd->path == NULL || dconf == NULL)
return "RewriteBase: only valid in per-directory config files";
--- 449,455 ----
return NULL;
}
! const char *cmd_rewritebase(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *a1)
{
if (cmd->path == NULL || dconf == NULL)
return "RewriteBase: only valid in per-directory config files";
***************
*** 463,469 ****
return NULL;
}
! static char *cmd_rewritecond(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *str)
{
rewrite_server_conf *sconf;
rewritecond_entry *new;
--- 463,469 ----
return NULL;
}
! const char *cmd_rewritecond(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *str)
{
rewrite_server_conf *sconf;
rewritecond_entry *new;
***************
*** 597,603 ****
return NULL;
}
! char *cmd_rewriterule(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *str)
{
rewrite_server_conf *sconf;
rewriterule_entry *new;
--- 597,603 ----
return NULL;
}
! const char *cmd_rewriterule(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *str)
{
rewrite_server_conf *sconf;
rewriterule_entry *new;
***************
*** 2711,2717 ****
char **cppHNLtest;
char *ourhostname;
char *ourhostip;
! char *names;
char *name;
int i, j;
--- 2711,2717 ----
char **cppHNLtest;
char *ourhostname;
char *ourhostip;
! const char *names;
char *name;
int i, j;