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/standard mod_file_cache.c
Date Wed, 05 Jul 2000 18:53:04 GMT
trawick     00/07/05 11:53:00

  Modified:    src/modules/standard mod_file_cache.c
  Log:
  Get rid of some warnings in mod_file_cache by moving to the
  new command-handler initialization macros.
  Submitted by:	Greg Ames
  Reviewed by:	Jeff Trawick
  
  Revision  Changes    Path
  1.13      +9 -8      apache-2.0/src/modules/standard/mod_file_cache.c
  
  Index: mod_file_cache.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_file_cache.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_file_cache.c	2000/07/05 18:44:37	1.12
  +++ mod_file_cache.c	2000/07/05 18:52:57	1.13
  @@ -158,7 +158,7 @@
       return sconf;
   }
   
  -static ap_status_t open_file(ap_file_t **file, char* filename, int flg1, int flg2, 
  +static ap_status_t open_file(ap_file_t **file, const char *filename, int flg1, int flg2,

                                ap_pool_t *p)
   {
       ap_status_t rv;
  @@ -189,7 +189,7 @@
   }
   
   #if APR_HAS_SENDFILE
  -ap_status_t cleanup_file_cache(void *sconfv)
  +static ap_status_t cleanup_file_cache(void *sconfv)
   {
       a_server_config *sconf = sconfv;
       size_t n;
  @@ -223,7 +223,8 @@
   }
   #endif
   
  -static const char *cachefile(cmd_parms *cmd, void *dummy, char *filename)
  +static const char *cachefile(cmd_parms *cmd, void *dummy, const char *filename)
  +
   {
   #if APR_HAS_SENDFILE
       a_server_config *sconf;
  @@ -276,7 +277,7 @@
   #endif
   }
   
  -static const char *mmapfile(cmd_parms *cmd, void *dummy, char *filename)
  +static const char *mmapfile(cmd_parms *cmd, void *dummy, const char *filename)
   {
   #if APR_HAS_MMAP
       a_server_config *sconf;
  @@ -511,10 +512,10 @@
   
   static command_rec file_cache_cmds[] =
   {
  -    {"cachefile", cachefile, NULL, RSRC_CONF, ITERATE,
  -     "A space seperated list of files to add to the file handle cache at config time"},
  -    {"mmapfile", mmapfile, NULL, RSRC_CONF, ITERATE,
  -     "A space seperated list of files to mmap at config time"},
  +AP_INIT_ITERATE("cachefile", cachefile, NULL, RSRC_CONF,
  +     "A space seperated list of files to add to the file handle cache at config time"),
  +AP_INIT_ITERATE("mmapfile", mmapfile, NULL, RSRC_CONF,
  +     "A space seperated list of files to mmap at config time"),
       {NULL}
   };
   
  
  
  

Mime
View raw message