dougm 01/03/15 21:32:36
Modified: lib/ModPerl Code.pm
src/modules/perl mod_perl.c modperl_config.c
modperl_config.h modperl_interp.c modperl_mgv.c
modperl_types.h
xs/Apache/RequestIO Apache__RequestIO.h
Log:
use consistent prefix for config related stuffs (am i anal or what?)
Revision Changes Path
1.47 +1 -1 modperl-2.0/lib/ModPerl/Code.pm
Index: Code.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Code.pm 2001/03/16 05:08:15 1.46
+++ Code.pm 2001/03/16 05:32:34 1.47
@@ -51,7 +51,7 @@
my $scfg_get = 'MP_dSCFG(parms->server)';
my $dcfg_get = "$scfg_get;\n" .
- 'modperl_dir_config_t *dcfg = (modperl_dir_config_t *)dummy';
+ 'modperl_config_dir_t *dcfg = (modperl_config_dir_t *)dummy';
my %directive_proto = (
PerSrv => {
1.38 +8 -8 modperl-2.0/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mod_perl.c 2001/03/16 05:08:15 1.37
+++ mod_perl.c 2001/03/16 05:32:35 1.38
@@ -28,7 +28,7 @@
);
#endif
- argv = modperl_srv_config_argv_init(scfg, &argc);
+ argv = modperl_config_srv_argv_init(scfg, &argc);
if (!(perl = perl_alloc())) {
perror("perl_alloc");
@@ -71,7 +71,7 @@
void modperl_init(server_rec *base_server, apr_pool_t *p)
{
server_rec *s;
- modperl_srv_config_t *base_scfg = modperl_srv_config_get(base_server);
+ modperl_config_srv_t *base_scfg = modperl_config_srv_get(base_server);
PerlInterpreter *base_perl;
MP_TRACE_d_do(MpSrv_dump_flags(base_scfg,
@@ -140,7 +140,7 @@
#ifdef USE_ITHREADS
static void modperl_init_clones(server_rec *s, apr_pool_t *p)
{
- modperl_srv_config_t *base_scfg = modperl_srv_config_get(s);
+ modperl_config_srv_t *base_scfg = modperl_config_srv_get(s);
#ifdef MP_TRACE
char *base_name = modperl_server_desc(s, p);
#endif /* MP_TRACE */
@@ -260,7 +260,7 @@
{
MP_dRCFG;
- modperl_request_config_init(r, rcfg);
+ modperl_config_req_init(r, rcfg);
/* setup buffer for output */
rcfg->wbucket.pool = r->pool;
@@ -299,10 +299,10 @@
module AP_MODULE_DECLARE_DATA perl_module = {
STANDARD20_MODULE_STUFF,
- modperl_create_dir_config, /* dir config creater */
- modperl_merge_dir_config, /* dir merger --- default is to override */
- modperl_create_srv_config, /* server config */
- modperl_merge_srv_config, /* merge server config */
+ modperl_config_dir_create, /* dir config creater */
+ modperl_config_dir_merge, /* dir merger --- default is to override */
+ modperl_config_srv_create, /* server config */
+ modperl_config_srv_merge, /* merge server config */
modperl_cmds, /* table of config file commands */
modperl_register_hooks, /* register hooks */
};
1.25 +26 -26 modperl-2.0/src/modules/perl/modperl_config.c
Index: modperl_config.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- modperl_config.c 2001/03/15 07:21:14 1.24
+++ modperl_config.c 2001/03/16 05:32:35 1.25
@@ -18,9 +18,9 @@
return NULL;
}
-void *modperl_create_dir_config(apr_pool_t *p, char *dir)
+void *modperl_config_dir_create(apr_pool_t *p, char *dir)
{
- modperl_dir_config_t *dcfg = modperl_dir_config_new(p);
+ modperl_config_dir_t *dcfg = modperl_config_dir_new(p);
#ifdef USE_ITHREADS
/* defaults to per-server lifetime */
@@ -33,12 +33,12 @@
#define merge_item(item) \
mrg->item = add->item ? add->item : base->item
-void *modperl_merge_dir_config(apr_pool_t *p, void *basev, void *addv)
+void *modperl_config_dir_merge(apr_pool_t *p, void *basev, void *addv)
{
- modperl_dir_config_t
- *base = (modperl_dir_config_t *)basev,
- *add = (modperl_dir_config_t *)addv,
- *mrg = modperl_dir_config_new(p);
+ modperl_config_dir_t
+ *base = (modperl_config_dir_t *)basev,
+ *add = (modperl_config_dir_t *)addv,
+ *mrg = modperl_config_dir_new(p);
MP_TRACE_d(MP_FUNC, "basev==0x%lx, addv==0x%lx\n",
(unsigned long)basev, (unsigned long)addv);
@@ -58,10 +58,10 @@
return mrg;
}
-modperl_request_config_t *modperl_request_config_new(request_rec *r)
+modperl_config_req_t *modperl_config_req_new(request_rec *r)
{
- modperl_request_config_t *rcfg =
- (modperl_request_config_t *)apr_pcalloc(r->pool, sizeof(*rcfg));
+ modperl_config_req_t *rcfg =
+ (modperl_config_req_t *)apr_pcalloc(r->pool, sizeof(*rcfg));
MP_TRACE_d(MP_FUNC, "0x%lx\n", (unsigned long)rcfg);
@@ -71,9 +71,9 @@
#define scfg_push_argv(arg) \
*(const char **)apr_array_push(scfg->argv) = arg
-modperl_srv_config_t *modperl_srv_config_new(apr_pool_t *p)
+modperl_config_srv_t *modperl_config_srv_new(apr_pool_t *p)
{
- modperl_srv_config_t *scfg = (modperl_srv_config_t *)
+ modperl_config_srv_t *scfg = (modperl_config_srv_t *)
apr_pcalloc(p, sizeof(*scfg));
scfg->flags = modperl_options_new(p, MpSrvType);
@@ -104,10 +104,10 @@
return scfg;
}
-modperl_dir_config_t *modperl_dir_config_new(apr_pool_t *p)
+modperl_config_dir_t *modperl_config_dir_new(apr_pool_t *p)
{
- modperl_dir_config_t *dcfg = (modperl_dir_config_t *)
- apr_pcalloc(p, sizeof(modperl_dir_config_t));
+ modperl_config_dir_t *dcfg = (modperl_config_dir_t *)
+ apr_pcalloc(p, sizeof(modperl_config_dir_t));
MP_TRACE_d(MP_FUNC, "0x%lx\n", (unsigned long)dcfg);
@@ -115,18 +115,18 @@
}
#ifdef MP_TRACE
-static void dump_argv(modperl_srv_config_t *scfg)
+static void dump_argv(modperl_config_srv_t *scfg)
{
int i;
char **argv = (char **)scfg->argv->elts;
- fprintf(stderr, "modperl_srv_config_argv_init =>\n");
+ fprintf(stderr, "modperl_config_srv_argv_init =>\n");
for (i=0; i<scfg->argv->nelts; i++) {
fprintf(stderr, " %d = %s\n", i, argv[i]);
}
}
#endif
-char **modperl_srv_config_argv_init(modperl_srv_config_t *scfg, int *argc)
+char **modperl_config_srv_argv_init(modperl_config_srv_t *scfg, int *argc)
{
scfg_push_argv("-e;0");
@@ -137,9 +137,9 @@
return (char **)scfg->argv->elts;
}
-void *modperl_create_srv_config(apr_pool_t *p, server_rec *s)
+void *modperl_config_srv_create(apr_pool_t *p, server_rec *s)
{
- modperl_srv_config_t *scfg = modperl_srv_config_new(p);
+ modperl_config_srv_t *scfg = modperl_config_srv_new(p);
#ifdef USE_ITHREADS
ap_mpm_query(AP_MPMQ_IS_THREADED, &scfg->threaded_mpm);
@@ -162,12 +162,12 @@
}
/* XXX: this is not complete */
-void *modperl_merge_srv_config(apr_pool_t *p, void *basev, void *addv)
+void *modperl_config_srv_merge(apr_pool_t *p, void *basev, void *addv)
{
- modperl_srv_config_t
- *base = (modperl_srv_config_t *)basev,
- *add = (modperl_srv_config_t *)addv,
- *mrg = modperl_srv_config_new(p);
+ modperl_config_srv_t
+ *base = (modperl_config_srv_t *)basev,
+ *add = (modperl_config_srv_t *)addv,
+ *mrg = modperl_config_srv_new(p);
MP_TRACE_d(MP_FUNC, "basev==0x%lx, addv==0x%lx\n",
(unsigned long)basev, (unsigned long)addv);
@@ -270,7 +270,7 @@
MP_DECLARE_SRV_CMD(interp_lifetime)
{
modperl_interp_lifetime_e *lifetime;
- modperl_dir_config_t *dcfg = (modperl_dir_config_t *)dummy;
+ modperl_config_dir_t *dcfg = (modperl_config_dir_t *)dummy;
MP_dSCFG(parms->server);
int is_per_dir = parms->path ? 1 : 0;
1.21 +19 -19 modperl-2.0/src/modules/perl/modperl_config.h
Index: modperl_config.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- modperl_config.h 2001/03/15 07:04:41 1.20
+++ modperl_config.h 2001/03/16 05:32:35 1.21
@@ -1,24 +1,24 @@
#ifndef MODPERL_CONFIG_H
#define MODPERL_CONFIG_H
-void *modperl_create_dir_config(apr_pool_t *p, char *dir);
+void *modperl_config_dir_create(apr_pool_t *p, char *dir);
-void *modperl_merge_dir_config(apr_pool_t *p, void *basev, void *addv);
+void *modperl_config_dir_merge(apr_pool_t *p, void *basev, void *addv);
-modperl_srv_config_t *modperl_srv_config_new(apr_pool_t *p);
+modperl_config_srv_t *modperl_config_srv_new(apr_pool_t *p);
-modperl_dir_config_t *modperl_dir_config_new(apr_pool_t *p);
+modperl_config_dir_t *modperl_config_dir_new(apr_pool_t *p);
-modperl_request_config_t *modperl_request_config_new(request_rec *r);
+modperl_config_req_t *modperl_config_req_new(request_rec *r);
-void *modperl_create_srv_config(apr_pool_t *p, server_rec *s);
+void *modperl_config_srv_create(apr_pool_t *p, server_rec *s);
-void *modperl_merge_srv_config(apr_pool_t *p, void *basev, void *addv);
+void *modperl_config_srv_merge(apr_pool_t *p, void *basev, void *addv);
char *modperl_cmd_push_handlers(MpAV **handlers, const char *name,
apr_pool_t *p);
-char **modperl_srv_config_argv_init(modperl_srv_config_t *scfg, int *argc);
+char **modperl_config_srv_argv_init(modperl_config_srv_t *scfg, int *argc);
#define MP_DECLARE_SRV_CMD(item) \
const char *modperl_cmd_##item(cmd_parms *parms, \
@@ -66,32 +66,32 @@
AP_INIT_TAKE1( name, modperl_cmd_##item, NULL, \
OR_ALL, desc )
-#define modperl_request_config_init(r, rcfg) \
+#define modperl_config_req_init(r, rcfg) \
if (!rcfg) { \
- rcfg = modperl_request_config_new(r); \
+ rcfg = modperl_config_req_new(r); \
ap_set_module_config(r->request_config, &perl_module, rcfg); \
}
-#define modperl_request_config_get(r) \
- (modperl_request_config_t *) \
+#define modperl_config_req_get(r) \
+ (modperl_config_req_t *) \
ap_get_module_config(r->request_config, &perl_module)
#define MP_dRCFG \
- modperl_request_config_t *rcfg = modperl_request_config_get(r)
+ modperl_config_req_t *rcfg = modperl_config_req_get(r)
-#define modperl_dir_config_get(r) \
- (r ? (modperl_dir_config_t *) \
+#define modperl_config_dir_get(r) \
+ (r ? (modperl_config_dir_t *) \
ap_get_module_config(r->per_dir_config, &perl_module) : NULL)
#define MP_dDCFG \
- modperl_dir_config_t *dcfg = modperl_dir_config_get(r)
+ modperl_config_dir_t *dcfg = modperl_config_dir_get(r)
-#define modperl_srv_config_get(s) \
- (modperl_srv_config_t *) \
+#define modperl_config_srv_get(s) \
+ (modperl_config_srv_t *) \
ap_get_module_config(s->module_config, &perl_module)
#define MP_dSCFG(s) \
- modperl_srv_config_t *scfg = modperl_srv_config_get(s)
+ modperl_config_srv_t *scfg = modperl_config_srv_get(s)
#ifdef USE_ITHREADS
# define MP_dSCFG_dTHX dTHXa(scfg->mip->parent->perl)
1.26 +1 -1 modperl-2.0/src/modules/perl/modperl_interp.c
Index: modperl_interp.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_interp.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- modperl_interp.c 2001/03/15 07:04:41 1.25
+++ modperl_interp.c 2001/03/16 05:32:35 1.26
@@ -207,7 +207,7 @@
server_rec *s)
{
MP_dSCFG(s);
- modperl_dir_config_t *dcfg = modperl_dir_config_get(rr);
+ modperl_config_dir_t *dcfg = modperl_config_dir_get(rr);
const char *desc = NULL;
modperl_interp_t *interp;
apr_pool_t *p = NULL;
1.6 +2 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- modperl_mgv.c 2001/03/15 07:43:14 1.5
+++ modperl_mgv.c 2001/03/16 05:32:35 1.6
@@ -378,7 +378,7 @@
MP_dSCFG_dTHX;
#endif
int i;
- modperl_dir_config_t *dir_cfg = (modperl_dir_config_t *)cfg;
+ modperl_config_dir_t *dir_cfg = (modperl_config_dir_t *)cfg;
if (!dir_cfg) {
return 1;
@@ -395,7 +395,7 @@
void *cfg, void *data)
{
int i;
- modperl_srv_config_t *scfg = (modperl_srv_config_t *)cfg;
+ modperl_config_srv_t *scfg = (modperl_config_srv_t *)cfg;
MP_dSCFG_dTHX;
for (i=0; i < MP_PER_SRV_NUM_HANDLERS; i++) {
1.27 +3 -3 modperl-2.0/src/modules/perl/modperl_types.h
Index: modperl_types.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_types.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- modperl_types.h 2001/03/15 07:04:41 1.26
+++ modperl_types.h 2001/03/16 05:32:35 1.27
@@ -138,7 +138,7 @@
#endif
MpAV *argv;
modperl_options_t *flags;
-} modperl_srv_config_t;
+} modperl_config_srv_t;
typedef struct {
char *location;
@@ -150,7 +150,7 @@
#ifdef USE_ITHREADS
modperl_interp_lifetime_e interp_lifetime;
#endif
-} modperl_dir_config_t;
+} modperl_config_dir_t;
typedef struct modperl_mgv_t modperl_mgv_t;
@@ -208,6 +208,6 @@
typedef struct {
HV *pnotes;
modperl_wbucket_t wbucket;
-} modperl_request_config_t;
+} modperl_config_req_t;
#endif /* MODPERL_TYPES_H */
1.3 +4 -4 modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h
Index: Apache__RequestIO.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Apache__RequestIO.h 2001/03/13 06:49:13 1.2
+++ Apache__RequestIO.h 2001/03/16 05:32:35 1.3
@@ -21,16 +21,16 @@
static MP_INLINE apr_size_t mpxs_ap_rvputs(pTHX_ I32 items,
SV **MARK, SV **SP)
{
- modperl_srv_config_t *scfg;
- modperl_request_config_t *rcfg;
+ modperl_config_srv_t *scfg;
+ modperl_config_req_t *rcfg;
apr_size_t bytes = 0;
request_rec *r;
dMP_TIMES;
mpxs_usage_va_1(r, "$r->puts(...)");
- rcfg = modperl_request_config_get(r);
- scfg = modperl_srv_config_get(r->server);
+ rcfg = modperl_config_req_get(r);
+ scfg = modperl_config_srv_get(r->server);
MP_START_TIMES();
