dougm 01/03/14 23:43:14
Modified: src/modules/perl modperl_mgv.c modperl_pcw.c modperl_pcw.h
Log:
try to use names with more meaning
Revision Changes Path
1.5 +6 -6 modperl-2.0/src/modules/perl/modperl_mgv.c
Index: modperl_mgv.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_mgv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- modperl_mgv.c 2001/03/15 06:12:14 1.4
+++ modperl_mgv.c 2001/03/15 07:43:14 1.5
@@ -370,8 +370,8 @@
}
}
-static int modperl_dw_hash_handlers(apr_pool_t *p, server_rec *s,
- void *cfg, char *d, void *data)
+static int modperl_hash_handlers_dir(apr_pool_t *p, server_rec *s,
+ void *cfg, char *d, void *data)
{
#ifdef USE_ITHREADS
MP_dSCFG(s);
@@ -391,8 +391,8 @@
return 1;
}
-static int modperl_sw_hash_handlers(apr_pool_t *p, server_rec *s,
- void *cfg, void *data)
+static int modperl_hash_handlers_srv(apr_pool_t *p, server_rec *s,
+ void *cfg, void *data)
{
int i;
modperl_srv_config_t *scfg = (modperl_srv_config_t *)cfg;
@@ -424,6 +424,6 @@
void modperl_mgv_hash_handlers(apr_pool_t *p, server_rec *s)
{
ap_pcw_walk_config(p, s, &perl_module, NULL,
- modperl_dw_hash_handlers,
- modperl_sw_hash_handlers);
+ modperl_hash_handlers_dir,
+ modperl_hash_handlers_srv);
}
1.2 +21 -18 modperl-2.0/src/modules/perl/modperl_pcw.c
Index: modperl_pcw.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_pcw.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- modperl_pcw.c 2001/03/09 23:42:27 1.1
+++ modperl_pcw.c 2001/03/15 07:43:14 1.2
@@ -8,7 +8,7 @@
void ap_pcw_walk_location_config(apr_pool_t *pconf, server_rec *s,
core_server_config *sconf,
module *modp,
- ap_pcw_dir_walker dw, void *data)
+ ap_pcw_dir_cb_t dir_cb, void *data)
{
int i;
ap_conf_vector_t **urls = (ap_conf_vector_t **)sconf->sec_url->elts;
@@ -18,7 +18,7 @@
ap_get_module_config(urls[i], &core_module);
void *dir_cfg = ap_get_module_config(urls[i], modp);
- if (!dw(pconf, s, dir_cfg, conf->d, data)) {
+ if (!dir_cb(pconf, s, dir_cfg, conf->d, data)) {
break;
}
}
@@ -27,7 +27,7 @@
void ap_pcw_walk_directory_config(apr_pool_t *pconf, server_rec *s,
core_server_config *sconf,
module *modp,
- ap_pcw_dir_walker dw, void *data)
+ ap_pcw_dir_cb_t dir_cb, void *data)
{
int i;
ap_conf_vector_t **dirs = (ap_conf_vector_t **)sconf->sec->elts;
@@ -36,7 +36,8 @@
core_dir_config *conf =
ap_get_module_config(dirs[i], &core_module);
void *dir_cfg = ap_get_module_config(dirs[i], modp);
- if (!dw(pconf, s, dir_cfg, conf->d, data)) {
+
+ if (!dir_cb(pconf, s, dir_cfg, conf->d, data)) {
break;
}
}
@@ -45,7 +46,7 @@
void ap_pcw_walk_files_config(apr_pool_t *pconf, server_rec *s,
core_dir_config *dconf,
module *modp,
- ap_pcw_dir_walker dw, void *data)
+ ap_pcw_dir_cb_t dir_cb, void *data)
{
int i;
ap_conf_vector_t **dirs = (ap_conf_vector_t **)dconf->sec->elts;
@@ -54,7 +55,8 @@
core_dir_config *conf =
ap_get_module_config(dirs[i], &core_module);
void *dir_cfg = ap_get_module_config(dirs[i], modp);
- if (!dw(pconf, s, dir_cfg, conf->d, data)) {
+
+ if (!dir_cb(pconf, s, dir_cfg, conf->d, data)) {
break;
}
}
@@ -62,19 +64,19 @@
void ap_pcw_walk_default_config(apr_pool_t *pconf, server_rec *s,
module *modp,
- ap_pcw_dir_walker dw, void *data)
+ ap_pcw_dir_cb_t dir_cb, void *data)
{
core_dir_config *conf =
ap_get_module_config(s->lookup_defaults, &core_module);
void *dir_cfg =
ap_get_module_config(s->lookup_defaults, modp);
- dw(pconf, s, dir_cfg, conf->d, data);
+ dir_cb(pconf, s, dir_cfg, conf->d, data);
}
void ap_pcw_walk_server_config(apr_pool_t *pconf, server_rec *s,
module *modp,
- ap_pcw_srv_walker sw, void *data)
+ ap_pcw_srv_cb_t srv_cb, void *data)
{
void *cfg = ap_get_module_config(s->module_config, modp);
@@ -82,12 +84,12 @@
return;
}
- sw(pconf, s, cfg, data);
+ srv_cb(pconf, s, cfg, data);
}
void ap_pcw_walk_config(apr_pool_t *pconf, server_rec *s,
module *modp, void *data,
- ap_pcw_dir_walker dw, ap_pcw_srv_walker sw)
+ ap_pcw_dir_cb_t dir_cb, ap_pcw_srv_cb_t srv_cb)
{
for (; s; s = s->next) {
core_dir_config *dconf =
@@ -98,14 +100,15 @@
ap_get_module_config(s->module_config,
&core_module);
- if (dw) {
- ap_pcw_walk_location_config(pconf, s, sconf, modp, dw, data);
- ap_pcw_walk_directory_config(pconf, s, sconf, modp, dw, data);
- ap_pcw_walk_files_config(pconf, s, dconf, modp, dw, data);
- ap_pcw_walk_default_config(pconf, s, modp, dw, data);
+ if (dir_cb) {
+ ap_pcw_walk_location_config(pconf, s, sconf, modp, dir_cb, data);
+ ap_pcw_walk_directory_config(pconf, s, sconf, modp, dir_cb, data);
+ ap_pcw_walk_files_config(pconf, s, dconf, modp, dir_cb, data);
+ ap_pcw_walk_default_config(pconf, s, modp, dir_cb, data);
}
- if (sw) {
- ap_pcw_walk_server_config(pconf, s, modp, sw, data);
+
+ if (srv_cb) {
+ ap_pcw_walk_server_config(pconf, s, modp, srv_cb, data);
}
}
}
1.2 +10 -10 modperl-2.0/src/modules/perl/modperl_pcw.h
Index: modperl_pcw.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_pcw.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- modperl_pcw.h 2001/03/09 23:42:27 1.1
+++ modperl_pcw.h 2001/03/15 07:43:14 1.2
@@ -1,37 +1,37 @@
#ifndef MODPERL_PCW_H
#define MODPERL_PCW_H
-typedef int (*ap_pcw_dir_walker) (apr_pool_t *, server_rec *,
- void *, char *, void *);
+typedef int (*ap_pcw_dir_cb_t) (apr_pool_t *, server_rec *,
+ void *, char *, void *);
-typedef int (*ap_pcw_srv_walker) (apr_pool_t *, server_rec *,
- void *, void *);
+typedef int (*ap_pcw_srv_cb_t) (apr_pool_t *, server_rec *,
+ void *, void *);
void ap_pcw_walk_location_config(apr_pool_t *pconf, server_rec *s,
core_server_config *sconf,
module *modp,
- ap_pcw_dir_walker dw, void *data);
+ ap_pcw_dir_cb_t dir_cb, void *data);
void ap_pcw_walk_directory_config(apr_pool_t *pconf, server_rec *s,
core_server_config *sconf,
module *modp,
- ap_pcw_dir_walker dw, void *data);
+ ap_pcw_dir_cb_t dir_cb, void *data);
void ap_pcw_walk_files_config(apr_pool_t *pconf, server_rec *s,
core_dir_config *dconf,
module *modp,
- ap_pcw_dir_walker dw, void *data);
+ ap_pcw_dir_cb_t dir_cb, void *data);
void ap_pcw_walk_default_config(apr_pool_t *pconf, server_rec *s,
module *modp,
- ap_pcw_dir_walker dw, void *data);
+ ap_pcw_dir_cb_t dir_cb, void *data);
void ap_pcw_walk_server_config(apr_pool_t *pconf, server_rec *s,
module *modp,
- ap_pcw_srv_walker sw, void *data);
+ ap_pcw_srv_cb_t srv_cb, void *data);
void ap_pcw_walk_config(apr_pool_t *pconf, server_rec *s,
module *modp, void *data,
- ap_pcw_dir_walker dw, ap_pcw_srv_walker sw);
+ ap_pcw_dir_cb_t dir_cb, ap_pcw_srv_cb_t srv_cb);
#endif /* MODPERL_PCW_H */
