Commit 2b7f256e authored by dgaudet's avatar dgaudet
Browse files

more namespace cleanup 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84961 13f79535-47bb-0310-9956-ffa450edef68
parent 48da75dd

include/http_config.h

+1 −0
Changes for include/http_config.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ void ap_setup_prelinked_modules(process_rec *process); 
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);

server/config.c

+1 −1
Changes for server/config.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1332,7 +1332,7 @@ void ap_single_module_configure(ap_context_t *p, server_rec *s, module *m) 
                             (*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;

server/main.c

+2 −2
Changes for server/main.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ API_EXPORT_NONSTD(int) main(int argc, char *argv[]) 
       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 @@ API_EXPORT_NONSTD(int) main(int argc, char *argv[]) 
	}

	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);

server/mpm/mpmt_pthread/scoreboard.c

+2 −2
Changes for server/mpm/mpmt_pthread/scoreboard.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -87,14 +87,14 @@ API_VAR_IMPORT char *ap_scoreboard_fname; 


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;