httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/experimental mod_charset_lite.c
Date Wed, 23 Aug 2000 01:46:26 GMT
trawick     00/08/22 18:46:25

  Modified:    src/modules/experimental mod_charset_lite.c
  Log:
  Use the AP_INIT_() command_rec initialization macros and fix
  up the signature of command handlers to avoid maintainer mode
  warnings.
  
  Revision  Changes    Path
  1.11      +26 -29    apache-2.0/src/modules/experimental/mod_charset_lite.c
  
  Index: mod_charset_lite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/experimental/mod_charset_lite.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_charset_lite.c	2000/08/21 11:02:32	1.10
  +++ mod_charset_lite.c	2000/08/23 01:46:25	1.11
  @@ -150,26 +150,32 @@
   
   /* CharsetSourceEnc charset
    */
  -static const char *add_charset_source(cmd_parms *cmd, charset_dir_t *dc, 
  -                                      char *name)
  +static const char *add_charset_source(cmd_parms *cmd, void *in_dc,
  +                                      const char *name)
   {
  +    charset_dir_t *dc = in_dc;
  +
       dc->charset_source = name;
       return NULL;
   }
   
   /* CharsetDefault charset
    */
  -static const char *add_charset_default(cmd_parms *cmd, charset_dir_t *dc, 
  -                                        char *name)
  +static const char *add_charset_default(cmd_parms *cmd, void *in_dc, 
  +                                       const char *name)
   {
  +    charset_dir_t *dc = in_dc;
  +
       dc->charset_default = name;
       return NULL;
   }
   
   /* CharsetDefault charset
    */
  -static const char *add_charset_debug(cmd_parms *cmd, charset_dir_t *dc, int arg)
  +static const char *add_charset_debug(cmd_parms *cmd, void *in_dc, int arg)
   {
  +    charset_dir_t *dc = in_dc;
  +
       if (arg) {
           dc->debug = DEBUG;
       }
  @@ -564,30 +570,21 @@
   
   static const command_rec cmds[] =
   {
  -    {
  -        "CharsetSourceEnc",
  -        add_charset_source,
  -        NULL,
  -        OR_FILEINFO,
  -        TAKE1,
  -        "source (html,cgi,ssi) file charset"
  -    },
  -    {
  -        "CharsetDefault", 
  -        add_charset_default,
  -        NULL,
  -        OR_FILEINFO, 
  -        TAKE1,
  -        "name of default charset"
  -    },
  -    {
  -        "CharsetDebug",
  -        add_charset_debug,
  -        NULL,
  -        OR_FILEINFO,
  -        FLAG,
  -        "mod_charset_lite debug flag"
  -    },
  +    AP_INIT_TAKE1("CharsetSourceEnc",
  +                  add_charset_source,
  +                  NULL,
  +                  OR_FILEINFO,
  +                  "source (html,cgi,ssi) file charset"),
  +    AP_INIT_TAKE1("CharsetDefault", 
  +                  add_charset_default,
  +                  NULL,
  +                  OR_FILEINFO, 
  +                  "name of default charset"),
  +    AP_INIT_FLAG("CharsetDebug",
  +                 add_charset_debug,
  +                 NULL,
  +                 OR_FILEINFO,
  +                 "mod_charset_lite debug flag"),
       {NULL}
   };
   
  
  
  

Mime
View raw message