@@ -294,10 +294,10 @@ struct cmd_parms_struct
294294 ap_directive_t * directive ;
295295
296296 /** Pool to allocate new storage in */
297- ap_pool_t * pool ;
297+ apr_pool_t * pool ;
298298 /** Pool for scratch memory; persists during configuration, but
299299 * wiped before the first request is served... */
300- ap_pool_t * temp_pool ;
300+ apr_pool_t * temp_pool ;
301301 /** Server_rec being configured for */
302302 server_rec * server ;
303303 /** If configuring for a directory, pathname of that directory.
@@ -371,35 +371,35 @@ struct module_struct {
371371 * @param p The pool to use for all allocations.
372372 * @param dir The directory currently being processed.
373373 * @return The per-directory structure created
374- * @deffunc void *create_dir_config(ap_pool_t *p, char *dir)
374+ * @deffunc void *create_dir_config(apr_pool_t *p, char *dir)
375375 */
376- void * (* create_dir_config ) (ap_pool_t * p , char * dir );
376+ void * (* create_dir_config ) (apr_pool_t * p , char * dir );
377377 /** Function to allow all modules to merge the per directory configuration
378378 * structures for two directories.
379379 * @param p The pool to use for all allocations.
380380 * @param base_conf The directory structure created for the parent directory.
381381 * @param new_conf The directory structure currently being processed.
382382 * @return The new per-directory structure created
383- * @deffunc void *merge_dir_config(ap_pool_t *p, void *base_conf, void *new_conf)
383+ * @deffunc void *merge_dir_config(apr_pool_t *p, void *base_conf, void *new_conf)
384384 */
385- void * (* merge_dir_config ) (ap_pool_t * p , void * base_conf , void * new_conf );
385+ void * (* merge_dir_config ) (apr_pool_t * p , void * base_conf , void * new_conf );
386386 /** Function to allow all modules to create per server configuration
387387 * structures.
388388 * @param p The pool to use for all allocations.
389389 * @param s The server currently being processed.
390390 * @return The per-server structure created
391- * @deffunc void *create_server_config(ap_pool_t *p, server_rec *dir)
391+ * @deffunc void *create_server_config(apr_pool_t *p, server_rec *dir)
392392 */
393- void * (* create_server_config ) (ap_pool_t * p , server_rec * s );
393+ void * (* create_server_config ) (apr_pool_t * p , server_rec * s );
394394 /** Function to allow all modules to merge the per server configuration
395395 * structures for two servers.
396396 * @param p The pool to use for all allocations.
397397 * @param base_conf The directory structure created for the parent directory.
398398 * @param new_conf The directory structure currently being processed.
399399 * @return The new per-directory structure created
400- * @deffunc void *merge_dir_config(ap_pool_t *p, void *base_conf, void *new_conf)
400+ * @deffunc void *merge_dir_config(apr_pool_t *p, void *base_conf, void *new_conf)
401401 */
402- void * (* merge_server_config ) (ap_pool_t * p , void * base_conf , void * new_conf );
402+ void * (* merge_server_config ) (apr_pool_t * p , void * base_conf , void * new_conf );
403403
404404 /** A command_rec table that describes all of the directives this module
405405 * defines. */
@@ -518,9 +518,9 @@ API_EXPORT_NONSTD(const char *) ap_set_file_slot(cmd_parms *, char *, const char
518518 * it relativizes it wrt server_root.
519519 * @param p pool to allocate data out of
520520 * @param fname The file name
521- * @deffunc const char *ap_server_root_relative(ap_pool_t *p, const char *fname)
521+ * @deffunc const char *ap_server_root_relative(apr_pool_t *p, const char *fname)
522522 */
523- API_EXPORT (const char * ) ap_server_root_relative (ap_pool_t * p , const char * fname );
523+ API_EXPORT (const char * ) ap_server_root_relative (apr_pool_t * p , const char * fname );
524524
525525/* Finally, the hook for dynamically loading modules in... */
526526
@@ -581,13 +581,13 @@ API_EXPORT(const char *) ap_find_module_name(module *m);
581581API_EXPORT (module * ) ap_find_linked_module (const char * name );
582582
583583/**
584- * Open a configfile_t as ap_file_t
584+ * Open a configfile_t as apr_file_t
585585 * @param ret_cfg open configfile_t struct pointer
586586 * @param p The pool to allocate the structure out of
587587 * @param name the name of the file to open
588- * @deffunc ap_status_t ap_pcfg_openfile(configfile_t **ret_cfg, ap_pool_t *p, const char *name)
588+ * @deffunc apr_status_t ap_pcfg_openfile(configfile_t **ret_cfg, apr_pool_t *p, const char *name)
589589 */
590- API_EXPORT (ap_status_t ) ap_pcfg_openfile (configfile_t * * , ap_pool_t * p , const char * name );
590+ API_EXPORT (apr_status_t ) ap_pcfg_openfile (configfile_t * * , apr_pool_t * p , const char * name );
591591
592592/**
593593 * Allocate a configfile_t handle with user defined functions and params
@@ -597,9 +597,9 @@ API_EXPORT(ap_status_t) ap_pcfg_openfile(configfile_t **, ap_pool_t *p, const ch
597597 * @param getc_func The getch function
598598 * @param gets_func The getstr function
599599 * @param close_func The close function
600- * @deffunc configfile_t *ap_pcfg_open_custom(ap_pool_t *p, const char *descr, void *param, int(*getc_func)(void*), void *(*gets_func) (void *buf, size_t bufsiz, void *param), int(*close_func)(void *param))
600+ * @deffunc configfile_t *ap_pcfg_open_custom(apr_pool_t *p, const char *descr, void *param, int(*getc_func)(void*), void *(*gets_func) (void *buf, size_t bufsiz, void *param), int(*close_func)(void *param))
601601 */
602- API_EXPORT (configfile_t * ) ap_pcfg_open_custom (ap_pool_t * p , const char * descr ,
602+ API_EXPORT (configfile_t * ) ap_pcfg_open_custom (apr_pool_t * p , const char * descr ,
603603 void * param ,
604604 int (* getc_func )(void * ),
605605 void * (* gets_func ) (void * buf , size_t bufsiz , void * param ),
@@ -651,9 +651,9 @@ API_EXPORT(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive);
651651 * @param curr_parent The current parent node
652652 * @param orig_directive The directive to read until hit.
653653 * @return Error string on failure, NULL on success
654- * @deffunc char *ap_build_cont_config(ap_pool_t *p, ap_pool_t *temp_pool, cmd_parms *parms, ap_directive_t **current, ap_directive_t **curr_parent, char *orig_directive)
654+ * @deffunc char *ap_build_cont_config(apr_pool_t *p, apr_pool_t *temp_pool, cmd_parms *parms, ap_directive_t **current, ap_directive_t **curr_parent, char *orig_directive)
655655*/
656- const char * ap_build_cont_config (ap_pool_t * p , ap_pool_t * temp_pool ,
656+ const char * ap_build_cont_config (apr_pool_t * p , apr_pool_t * temp_pool ,
657657 cmd_parms * parms ,
658658 ap_directive_t * * current ,
659659 ap_directive_t * * curr_parent ,
@@ -666,11 +666,11 @@ const char * ap_build_cont_config(ap_pool_t *p, ap_pool_t *temp_pool,
666666 * @param temp_pool The temporary pool
667667 * @param conftree Place to store the root node of the config tree
668668 * @return Error string on erro, NULL otherwise
669- * @deffunc const char *ap_build_config(cmd_parms *parms, ap_pool_t *conf_pool, ap_pool_t *temp_pool, ap_directive_t **conftree)
669+ * @deffunc const char *ap_build_config(cmd_parms *parms, apr_pool_t *conf_pool, apr_pool_t *temp_pool, ap_directive_t **conftree)
670670 */
671671API_EXPORT (const char * ) ap_build_config (cmd_parms * parms ,
672- ap_pool_t * conf_pool ,
673- ap_pool_t * temp_pool ,
672+ apr_pool_t * conf_pool ,
673+ apr_pool_t * temp_pool ,
674674 ap_directive_t * * conftree );
675675
676676/**
@@ -742,7 +742,7 @@ extern API_VAR_EXPORT module **ap_loaded_modules;
742742 * @param s The server to configure for.
743743 * @param m The module to configure
744744 */
745- void ap_single_module_configure (ap_pool_t * p , server_rec * s , module * m );
745+ void ap_single_module_configure (apr_pool_t * p , server_rec * s , module * m );
746746
747747/* For http_main.c... */
748748/**
@@ -773,19 +773,19 @@ API_EXPORT(void) ap_show_modules(void);
773773 * @param config_name The name of the config file
774774 * @param conftree Place to store the root of the config tree
775775 * @return The setup server_rec list.
776- * @deffunc server_rec *ap_read_config(process_rec *process, ap_pool_t *temp_pool, const char *config_name, ap_directive_t **conftree)
776+ * @deffunc server_rec *ap_read_config(process_rec *process, apr_pool_t *temp_pool, const char *config_name, ap_directive_t **conftree)
777777 */
778- API_EXPORT (server_rec * ) ap_read_config (process_rec * process , ap_pool_t * temp_pool , const char * config_name , ap_directive_t * * conftree );
778+ API_EXPORT (server_rec * ) ap_read_config (process_rec * process , apr_pool_t * temp_pool , const char * config_name , ap_directive_t * * conftree );
779779
780780/**
781781 * Run all post config hooks for loaded modules.
782782 * @param pconf The configuration pool
783783 * @param plog The logging pool
784784 * @param ptemp The temporary pool
785785 * @param s The list of server_rec structures
786- * @deffunc void ap_post_config_hook(ap_pool_t *pconf, ap_pool_t *plog, ap_pool_t *ptemp, server_rec *s)
786+ * @deffunc void ap_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
787787 */
788- API_EXPORT (void ) ap_post_config_hook (ap_pool_t * pconf , ap_pool_t * plog , ap_pool_t * ptemp , server_rec * s );
788+ API_EXPORT (void ) ap_post_config_hook (apr_pool_t * pconf , apr_pool_t * plog , apr_pool_t * ptemp , server_rec * s );
789789
790790/**
791791 * Run all rewrite args hooks for loaded modules
@@ -805,9 +805,9 @@ API_EXPORT(void) ap_register_hooks(module *m);
805805 * Setup all virtual hosts
806806 * @param p The pool to allocate out of
807807 * @param main_server The head of the server_rec list
808- * @deffunc void ap_fixup_virtual_hosts(ap_pool_t *p, server_rec *main_server)
808+ * @deffunc void ap_fixup_virtual_hosts(apr_pool_t *p, server_rec *main_server)
809809 */
810- API_EXPORT (void ) ap_fixup_virtual_hosts (ap_pool_t * p , server_rec * main_server );
810+ API_EXPORT (void ) ap_fixup_virtual_hosts (apr_pool_t * p , server_rec * main_server );
811811
812812/* For http_request.c... */
813813
@@ -816,31 +816,31 @@ API_EXPORT(void) ap_fixup_virtual_hosts(ap_pool_t *p, server_rec *main_server);
816816 * @param p The pool to allocate the config vector out of
817817 * @return The config vector
818818 */
819- void * ap_create_request_config (ap_pool_t * p );
819+ void * ap_create_request_config (apr_pool_t * p );
820820
821821/**
822822 * Setup the config vector for per dir module configs
823823 * @param p The pool to allocate the config vector out of
824824 * @return The config vector
825- * @deffunc void *ap_create_per_dir_config(ap_pool_t *p)
825+ * @deffunc void *ap_create_per_dir_config(apr_pool_t *p)
826826 */
827- CORE_EXPORT (void * ) ap_create_per_dir_config (ap_pool_t * p );
827+ CORE_EXPORT (void * ) ap_create_per_dir_config (apr_pool_t * p );
828828
829829/**
830830 * Run all of the modules merge per dir config functions
831831 * @param p The pool to pass to the merge functions
832832 * @param base The base directory config structure
833833 * @param new The new directory config structure
834834 */
835- void * ap_merge_per_dir_configs (ap_pool_t * p , void * base , void * new );
835+ void * ap_merge_per_dir_configs (apr_pool_t * p , void * base , void * new );
836836
837837/* For http_connection.c... */
838838/**
839839 * Setup the config vector for a connection_rec
840840 * @param p The pool to allocate the config vector out of
841841 * @return The config vector
842842 */
843- void * ap_create_conn_config (ap_pool_t * p );
843+ void * ap_create_conn_config (apr_pool_t * p );
844844
845845/* For http_core.c... (<Directory> command and virtual hosts) */
846846
@@ -863,9 +863,9 @@ int ap_parse_htaccess(void **result, request_rec *r, int override,
863863 * @param main_server The main server for this Apache configuration
864864 * @param ps Place to store the new server_rec
865865 * return Error string on error, NULL on success
866- * @deffunc const char *ap_init_virtual_host(ap_pool_t *p, const char *hostname, server_rec *main_server, server_rec **ps)
866+ * @deffunc const char *ap_init_virtual_host(apr_pool_t *p, const char *hostname, server_rec *main_server, server_rec **ps)
867867 */
868- CORE_EXPORT (const char * ) ap_init_virtual_host (ap_pool_t * p , const char * hostname ,
868+ CORE_EXPORT (const char * ) ap_init_virtual_host (apr_pool_t * p , const char * hostname ,
869869 server_rec * main_server , server_rec * * );
870870
871871/**
@@ -877,7 +877,7 @@ CORE_EXPORT(const char *) ap_init_virtual_host(ap_pool_t *p, const char *hostnam
877877 * @param ptem Pool for temporary allocation
878878 */
879879void ap_process_resource_config (server_rec * s , const char * fname ,
880- ap_directive_t * * conftree , ap_pool_t * p , ap_pool_t * ptemp );
880+ ap_directive_t * * conftree , apr_pool_t * p , apr_pool_t * ptemp );
881881
882882/**
883883 * Process all directives in the config tree
@@ -887,7 +887,7 @@ void ap_process_resource_config(server_rec *s, const char *fname,
887887 * @param ptemp The pool for temporary allocations
888888 */
889889API_EXPORT (void ) ap_process_config_tree (server_rec * s , ap_directive_t * conftree ,
890- ap_pool_t * p , ap_pool_t * ptemp );
890+ apr_pool_t * p , apr_pool_t * ptemp );
891891
892892
893893/* For individual MPMs... */
@@ -896,7 +896,7 @@ API_EXPORT(void) ap_process_config_tree(server_rec *s, ap_directive_t *conftree,
896896 * @param pchild The pool for child process allocations
897897 * @param s The list of all server_recs
898898 */
899- void ap_child_init_hook (ap_pool_t * pchild , server_rec * s );
899+ void ap_child_init_hook (apr_pool_t * pchild , server_rec * s );
900900
901901/* Module-method dispatchers, also for http_request.c */
902902/**
@@ -954,40 +954,40 @@ AP_DECLARE_HOOK(int,header_parser,(request_rec *))
954954 * @param pconf The config pool
955955 * @param plog The logging streams pool
956956 * @param ptemp The temporary pool
957- * @deffunc void ap_run_pre_config(ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp)
957+ * @deffunc void ap_run_pre_config(apr_pool_t *pconf,apr_pool_t *plog,apr_pool_t *ptemp)
958958 */
959959AP_DECLARE_HOOK (void ,pre_config ,
960- (ap_pool_t * pconf ,ap_pool_t * plog ,ap_pool_t * ptemp ))
960+ (apr_pool_t * pconf ,apr_pool_t * plog ,apr_pool_t * ptemp ))
961961
962962/**
963963 * Run the post_config function for each module
964964 * @param pconf The config pool
965965 * @param plog The logging streams pool
966966 * @param ptemp The temporary pool
967967 * @param s The list of server_recs
968- * @deffunc void ap_run_post_config(ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp, server_rec *s)
968+ * @deffunc void ap_run_post_config(apr_pool_t *pconf,apr_pool_t *plog,apr_pool_t *ptemp, server_rec *s)
969969 */
970970AP_DECLARE_HOOK (void ,post_config ,
971- (ap_pool_t * pconf ,ap_pool_t * plog ,ap_pool_t * ptemp ,server_rec * s ))
971+ (apr_pool_t * pconf ,apr_pool_t * plog ,apr_pool_t * ptemp ,server_rec * s ))
972972
973973/**
974974 * Run the open_logs functions for each module
975975 * @param pconf The config pool
976976 * @param plog The logging streams pool
977977 * @param ptemp The temporary pool
978978 * @param s The list of server_recs
979- * @deffunc void ap_run_open_logs(ap_pool_t *pconf,ap_pool_t *plog,ap_pool_t *ptemp, server_rec *s)
979+ * @deffunc void ap_run_open_logs(apr_pool_t *pconf,apr_pool_t *plog,apr_pool_t *ptemp, server_rec *s)
980980 */
981981AP_DECLARE_HOOK (void ,open_logs ,
982- (ap_pool_t * pconf ,ap_pool_t * plog ,ap_pool_t * ptemp ,server_rec * s ))
982+ (apr_pool_t * pconf ,apr_pool_t * plog ,apr_pool_t * ptemp ,server_rec * s ))
983983
984984/**
985985 * Run the child_init functions for each module
986986 * @param pchild The child pool
987987 * @param s The list of server_recs in this server
988- * @deffunc void ap_run_child_init(ap_pool_t *pchild, server_rec *s)
988+ * @deffunc void ap_run_child_init(apr_pool_t *pchild, server_rec *s)
989989 */
990- AP_DECLARE_HOOK (void ,child_init ,(ap_pool_t * pchild , server_rec * s ))
990+ AP_DECLARE_HOOK (void ,child_init ,(apr_pool_t * pchild , server_rec * s ))
991991
992992#ifdef __cplusplus
993993}
0 commit comments