Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 25 Jul 2000 19:52:38 -0000
Message-ID: <20000725195238.1590.qmail@locus.apache.org>
From: rbb@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/modules/standard mod_so.c

rbb         00/07/25 12:52:38

  Modified:    src/modules/standard mod_so.c
  Log:
  Update mod_so to use the new command_rec format.
  
  Revision  Changes    Path
  1.25      +9 -9      apache-2.0/src/modules/standard/mod_so.c
  
  Index: mod_so.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_so.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mod_so.c	2000/07/25 03:40:24	1.24
  +++ mod_so.c	2000/07/25 19:52:37	1.25
  @@ -144,7 +144,7 @@
    */
   
   typedef struct moduleinfo {
  -    char *name;
  +    const char *name;
       module *modp;
   } moduleinfo;
   
  @@ -217,7 +217,7 @@
    */
   
   static const char *load_module(cmd_parms *cmd, void *dummy, 
  -                               char *modname, char *filename)
  +                               const char *modname, const char *filename)
   {
       ap_status_t status;
       ap_dso_handle_t *modhandle;
  @@ -316,7 +316,7 @@
    * shared object file into the adress space of the server process.
    */
   
  -static const char *load_file(cmd_parms *cmd, void *dummy, char *filename)
  +static const char *load_file(cmd_parms *cmd, void *dummy, const char *filename)
   {
       ap_status_t status;
       ap_dso_handle_t *handle;
  @@ -343,7 +343,7 @@
   
   #else /* not NO_DLOPEN */
   
  -static const char *load_file(cmd_parms *cmd, void *dummy, char *filename)
  +static const char *load_file(cmd_parms *cmd, void *dummy, const char *filename)
   {
       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
                    "WARNING: LoadFile not supported on this platform");
  @@ -351,7 +351,7 @@
   }
   
   static const char *load_module(cmd_parms *cmd, void *dummy, 
  -	                       char *modname, char *filename)
  +	                       const char *modname, const char *filename)
   {
       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
                    "WARNING: LoadModule not supported on this platform");
  @@ -361,10 +361,10 @@
   #endif /* NO_DLOPEN */
   
   static const command_rec so_cmds[] = {
  -    { "LoadModule", load_module, NULL, RSRC_CONF | EXEC_ON_READ, TAKE2,
  -      "a module name and the name of a shared object file to load it from"},
  -    { "LoadFile", load_file, NULL, RSRC_CONF, ITERATE,
  -      "shared object file or library to load into the server at runtime"},
  +    AP_INIT_TAKE2("LoadModule", load_module, NULL, RSRC_CONF | EXEC_ON_READ,
  +      "a module name and the name of a shared object file to load it from"),
  +    AP_INIT_ITERATE("LoadFile", load_file, NULL, RSRC_CONF,
  +      "shared object file or library to load into the server at runtime"),
       { NULL }
   };