httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/main http_config.c http_main.c
Date Thu, 30 Mar 2000 18:39:47 GMT
rbb         00/03/30 10:39:47

  Modified:    src/include http_config.h
               src/main http_config.c http_main.c
  Log:
  Fix the warnings associated with the pre_config patch.
  
  Revision  Changes    Path
  1.10      +1 -1      apache-2.0/src/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/http_config.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- http_config.h	2000/03/30 15:30:32	1.9
  +++ http_config.h	2000/03/30 18:39:45	1.10
  @@ -210,7 +210,7 @@
                                    * It's mainly important for the DSO facility
                                    * (see also mod_so).
                                    */
  -    void *(*pre_config) (ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp, server_rec
*s);
  +    void (*pre_config) (ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp);
       void *(*create_dir_config) (ap_context_t *p, char *dir);
       void *(*merge_dir_config) (ap_context_t *p, void *base_conf, void *new_conf);
       void *(*create_server_config) (ap_context_t *p, server_rec *s);
  
  
  
  1.33      +2 -3      apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- http_config.c	2000/03/30 15:30:32	1.32
  +++ http_config.c	2000/03/30 18:39:46	1.33
  @@ -1308,14 +1308,13 @@
                                (*m->create_dir_config)(p, NULL));
   }
   
  -void run_pre_config(ap_context_t *p, ap_context_t *plog,
  -                       ap_context_t *ptemp, server_rec *s)
  +void run_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp)
   {
       module *m;
   
       for (m = top_module; m; m = m->next)
           if (m->pre_config)
  -            (*m->pre_config) (p, plog, ptemp, s);
  +            (*m->pre_config) (p, plog, ptemp);
       init_handlers(p);
   }
   
  
  
  
  1.39      +2 -2      apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- http_main.c	2000/03/30 15:30:32	1.38
  +++ http_main.c	2000/03/30 18:39:46	1.39
  @@ -364,7 +364,7 @@
          for example, to settle down. */
   
       ap_server_root = def_server_root;
  -    run_pre_config(pconf, plog, ptemp, server_conf);
  +    run_pre_config(pconf, plog, ptemp);
       server_conf = ap_read_config(process, ptemp, confname);
       if (configtestonly) {
   	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "Syntax OK\n");
  @@ -383,7 +383,7 @@
   	}
   	ap_create_context(&ptemp, pconf);
   	ap_server_root = def_server_root;
  -	run_pre_config(pconf, plog, ptemp, server_conf);
  +	run_pre_config(pconf, plog, ptemp);
   	server_conf = ap_read_config(process, ptemp, confname);
   	ap_clear_pool(plog);
   	ap_run_open_logs(pconf, plog, ptemp, server_conf);
  
  
  

Mime
View raw message