httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/mpmt_pthread scoreboard.c
Date Fri, 14 Apr 2000 02:39:08 GMT
dgaudet     00/04/13 19:39:08

  Modified:    src/include http_config.h
               src/main http_config.c http_main.c
               src/modules/mpm/mpmt_pthread scoreboard.c
  Log:
  more namespace cleanup
  
  Revision  Changes    Path
  1.12      +1 -0      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- http_config.h	2000/03/31 07:18:56	1.11
  +++ http_config.h	2000/04/14 02:39:05	1.12
  @@ -337,6 +337,7 @@
   void ap_show_directives(void);
   void ap_show_modules(void);
   server_rec *ap_read_config(process_rec *process, ap_context_t *temp_pool, const char *config_name);
  +void ap_run_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp);
   void ap_post_config_hook(ap_context_t *pconf, ap_context_t *plog, ap_context_t *ptemp,
server_rec *s);
   void ap_child_init_hook(ap_context_t *pchild, server_rec *s);
   void ap_register_hooks(module *m);
  
  
  
  1.36      +1 -1      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.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- http_config.c	2000/04/12 21:57:48	1.35
  +++ http_config.c	2000/04/14 02:39:06	1.36
  @@ -1332,7 +1332,7 @@
                                (*m->create_dir_config)(p, NULL));
   }
   
  -void run_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp)
  +void ap_run_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp)
   {
       module *m;
   
  
  
  
  1.41      +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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- http_main.c	2000/03/31 08:44:20	1.40
  +++ http_main.c	2000/04/14 02:39:06	1.41
  @@ -365,7 +365,7 @@
          for example, to settle down. */
   
       ap_server_root = def_server_root;
  -    run_pre_config(pconf, plog, ptemp);
  +    ap_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");
  @@ -384,7 +384,7 @@
   	}
   	ap_create_context(&ptemp, pconf);
   	ap_server_root = def_server_root;
  -	run_pre_config(pconf, plog, ptemp);
  +	ap_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);
  
  
  
  1.20      +2 -2      apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- scoreboard.c	2000/03/31 09:05:09	1.19
  +++ scoreboard.c	2000/04/14 02:39:08	1.20
  @@ -87,14 +87,14 @@
   
   static ap_shmem_t *scoreboard_shm = NULL;
   
  -ap_status_t cleanup_shared_mem(void *d)
  +static ap_status_t cleanup_shared_mem(void *d)
   {
       mm_free(scoreboard_shm, ap_scoreboard_image);
       ap_scoreboard_image = NULL;
       ap_shm_destroy(scoreboard_shm);
   }
   
  -void setup_shared_mem(ap_context_t *p)
  +static void setup_shared_mem(ap_context_t *p)
   {
       char buf[512];
       const char *fname;
  
  
  

Mime
View raw message