dougm 01/03/14 09:28:07
Modified: src/modules/perl modperl_callback.c modperl_callback.h
Log:
canonicalize MP_HANDLER_TYPE_ names
Revision Changes Path
1.26 +17 -15 modperl-2.0/src/modules/perl/modperl_callback.c
Index: modperl_callback.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- modperl_callback.c 2001/03/14 05:22:49 1.25
+++ modperl_callback.c 2001/03/14 17:28:07 1.26
@@ -173,23 +173,23 @@
}
switch (type) {
- case MP_HANDLER_TYPE_DIR:
+ case MP_HANDLER_TYPE_PER_DIR:
av = dcfg->handlers[idx];
MP_TRACE_a_do(desc = modperl_per_dir_handler_desc(idx));
break;
- case MP_HANDLER_TYPE_SRV:
+ case MP_HANDLER_TYPE_PER_SRV:
av = scfg->handlers[idx];
MP_TRACE_a_do(desc = modperl_per_srv_handler_desc(idx));
break;
- case MP_HANDLER_TYPE_CONN:
+ case MP_HANDLER_TYPE_CONNECTION:
av = scfg->connection_cfg->handlers[idx];
MP_TRACE_a_do(desc = modperl_connection_handler_desc(idx));
break;
- case MP_HANDLER_TYPE_FILE:
+ case MP_HANDLER_TYPE_FILES:
av = scfg->files_cfg->handlers[idx];
MP_TRACE_a_do(desc = modperl_files_handler_desc(idx));
break;
- case MP_HANDLER_TYPE_PROC:
+ case MP_HANDLER_TYPE_PROCESS:
av = scfg->process_cfg->handlers[idx];
MP_TRACE_a_do(desc = modperl_process_handler_desc(idx));
break;
@@ -222,16 +222,16 @@
handlers = (modperl_handler_t **)av->elts;
switch (type) {
- case MP_HANDLER_TYPE_DIR:
- case MP_HANDLER_TYPE_SRV:
+ case MP_HANDLER_TYPE_PER_DIR:
+ case MP_HANDLER_TYPE_PER_SRV:
modperl_handler_make_args(aTHX_ &av_args,
"Apache::RequestRec", r, NULL);
break;
- case MP_HANDLER_TYPE_CONN:
+ case MP_HANDLER_TYPE_CONNECTION:
modperl_handler_make_args(aTHX_ &av_args,
"Apache::Connection", c, NULL);
break;
- case MP_HANDLER_TYPE_FILE:
+ case MP_HANDLER_TYPE_FILES:
{
apr_pool_t *pconf, *plog, *ptemp;
@@ -248,7 +248,7 @@
"Apache::Server", s, NULL);
}
break;
- case MP_HANDLER_TYPE_PROC:
+ case MP_HANDLER_TYPE_PROCESS:
{
apr_pool_t *pconf;
@@ -292,29 +292,31 @@
int modperl_per_dir_callback(int idx, request_rec *r)
{
- return modperl_run_handlers(idx, r, NULL, r->server, MP_HANDLER_TYPE_DIR);
+ return modperl_run_handlers(idx, r, NULL, r->server,
+ MP_HANDLER_TYPE_PER_DIR);
}
int modperl_per_srv_callback(int idx, request_rec *r)
{
- return modperl_run_handlers(idx, r, NULL, r->server, MP_HANDLER_TYPE_SRV);
+ return modperl_run_handlers(idx, r, NULL, r->server,
+ MP_HANDLER_TYPE_PER_SRV);
}
int modperl_connection_callback(int idx, conn_rec *c)
{
return modperl_run_handlers(idx, NULL, c, c->base_server,
- MP_HANDLER_TYPE_CONN);
+ MP_HANDLER_TYPE_CONNECTION);
}
void modperl_process_callback(int idx, apr_pool_t *p, server_rec *s)
{
- modperl_run_handlers(idx, NULL, NULL, s, MP_HANDLER_TYPE_PROC, p);
+ modperl_run_handlers(idx, NULL, NULL, s, MP_HANDLER_TYPE_PROCESS, p);
}
void modperl_files_callback(int idx,
apr_pool_t *pconf, apr_pool_t *plog,
apr_pool_t *ptemp, server_rec *s)
{
- modperl_run_handlers(idx, NULL, NULL, s, MP_HANDLER_TYPE_FILE,
+ modperl_run_handlers(idx, NULL, NULL, s, MP_HANDLER_TYPE_FILES,
pconf, plog, ptemp);
}
1.13 +5 -5 modperl-2.0/src/modules/perl/modperl_callback.h
Index: modperl_callback.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- modperl_callback.h 2001/03/14 00:37:52 1.12
+++ modperl_callback.h 2001/03/14 17:28:07 1.13
@@ -10,11 +10,11 @@
#define ap_hook_fixup ap_hook_fixups
#define ap_hook_log ap_hook_log_transaction
-#define MP_HANDLER_TYPE_DIR 1
-#define MP_HANDLER_TYPE_SRV 2
-#define MP_HANDLER_TYPE_CONN 3
-#define MP_HANDLER_TYPE_PROC 4
-#define MP_HANDLER_TYPE_FILE 5
+#define MP_HANDLER_TYPE_PER_DIR 1
+#define MP_HANDLER_TYPE_PER_SRV 2
+#define MP_HANDLER_TYPE_CONNECTION 3
+#define MP_HANDLER_TYPE_PROCESS 4
+#define MP_HANDLER_TYPE_FILES 5
modperl_handler_t *modperl_handler_new(apr_pool_t *p, const char *name);
