Received: by taz.hyperreal.com (8.7.6/V2.0) id JAA18436;
 Thu, 31 Oct 1996 09:19:59 -0800 (PST)
Received: by taz.hyperreal.com (8.7.6/V2.0) id JAA18415;
 Thu, 31 Oct 1996 09:19:56 -0800 (PST)
Date: Thu, 31 Oct 1996 09:19:56 -0800 (PST)
From: Brian Behlendorf <brian@hyperreal.com>
Message-Id: <199610311719.JAA18415@taz.hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src mod_rewrite.h mod_rewrite.c
Sender: owner-apache-cvs@apache.org
Precedence: bulk
Reply-To: new-httpd@hyperreal.com

brian       96/10/31 09:19:56

  Modified:    src       mod_rewrite.h mod_rewrite.c
  Log:
  Reinstituted "static" declarations.
  
  Revision  Changes    Path
  1.8       +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.7
  retrieving revision 1.8
  diff -C3 -r1.7 -r1.8
  *** mod_rewrite.h	1996/10/31 01:46:26	1.7
  --- mod_rewrite.h	1996/10/31 17:19:36	1.8
  ***************
  *** 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);
    
  --- 291,310 ----
    static void *config_perdir_merge (pool *p, void *basev, void *overridesv);
    
        /* config directive handling */
  ! static const char *cmd_rewriteengine  (cmd_parms *cmd, rewrite_perdir_conf *dconf, int flag);
  ! static const char *cmd_rewriteoptions (cmd_parms *cmd, rewrite_perdir_conf *dconf, char *option);
    static char *cmd_rewriteoptions_setoption(pool *p, int *options, char *name);
  ! static const char *cmd_rewritelog     (cmd_parms *cmd, void *dconf, char *a1);
  ! static const char *cmd_rewriteloglevel(cmd_parms *cmd, void *dconf, char *a1);
  ! static const char *cmd_rewritemap     (cmd_parms *cmd, void *dconf, char *a1, char *a2);
    
  ! static const char *cmd_rewritebase(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *a1);
    
  ! static 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);
    
  ! extern 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.7       +7 -7      apache/src/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -C3 -r1.6 -r1.7
  *** mod_rewrite.c	1996/10/31 01:46:28	1.6
  --- mod_rewrite.c	1996/10/31 17:19:36	1.7
  ***************
  *** 349,355 ****
    **
    */
    
  ! const char *cmd_rewriteengine(cmd_parms *cmd, rewrite_perdir_conf *dconf, int flag)
    {
        rewrite_server_conf *sconf;
    
  --- 349,355 ----
    **
    */
    
  ! static const char *cmd_rewriteengine(cmd_parms *cmd, rewrite_perdir_conf *dconf, int flag)
    {
        rewrite_server_conf *sconf;
    
  ***************
  *** 362,368 ****
        return NULL;
    }
    
  ! const char *cmd_rewriteoptions(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *option)
    {
        rewrite_server_conf *sconf;
        char *err;
  --- 362,368 ----
        return NULL;
    }
    
  ! static const char *cmd_rewriteoptions(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *option)
    {
        rewrite_server_conf *sconf;
        char *err;
  ***************
  *** 385,391 ****
        return NULL;
    }
    
  ! const char *cmd_rewritelog(cmd_parms *cmd, void *dconf, char *a1)
    {
        rewrite_server_conf *sconf;
    
  --- 385,391 ----
        return NULL;
    }
    
  ! static const char *cmd_rewritelog(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;
    
  --- 395,401 ----
        return NULL;
    }
    
  ! static const char *cmd_rewriteloglevel(cmd_parms *cmd, void *dconf, char *a1)
    {
        rewrite_server_conf *sconf;
    
  ***************
  *** 405,411 ****
        return NULL;
    }
    
  ! const char *cmd_rewritemap(cmd_parms *cmd, void *dconf, char *a1, char *a2)
    {
        rewrite_server_conf *sconf;
        rewritemap_entry *new;
  --- 405,411 ----
        return NULL;
    }
    
  ! static const char *cmd_rewritemap(cmd_parms *cmd, void *dconf, char *a1, char *a2)
    {
        rewrite_server_conf *sconf;
        rewritemap_entry *new;
  ***************
  *** 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";
  --- 449,455 ----
        return NULL;
    }
    
  ! static 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;
    }
    
  ! const char *cmd_rewritecond(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *str)
    {
        rewrite_server_conf *sconf;
        rewritecond_entry *new;
  --- 463,469 ----
        return NULL;
    }
    
  ! static const char *cmd_rewritecond(cmd_parms *cmd, rewrite_perdir_conf *dconf, char *str)
    {
        rewrite_server_conf *sconf;
        rewritecond_entry *new;