dougm 01/03/15 21:08:15
Modified: lib/ModPerl Code.pm
src/modules/perl mod_perl.c modperl_callback.c
modperl_callback.h
Log:
use proper prefix for all modperl_callback_ functions
Revision Changes Path
1.46 +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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Code.pm 2001/03/16 04:58:57 1.45
+++ Code.pm 2001/03/16 05:08:15 1.46
@@ -167,7 +167,7 @@
my @register_hooks;
while (my($class, $prototype) = each %{ $self->{hook_proto} }) {
- my $callback = canon_func($class, 'callback');
+ my $callback = canon_func('callback', $class);
my $return = $prototype->{ret} eq 'void' ? '' : 'return';
my $i = -1;
1.37 +1 -1 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mod_perl.c 2001/03/15 04:34:04 1.36
+++ mod_perl.c 2001/03/16 05:08:15 1.37
@@ -286,7 +286,7 @@
modperl_response_init(r);
- retval = modperl_per_dir_callback(MP_RESPONSE_HANDLER, r);
+ retval = modperl_callback_per_dir(MP_RESPONSE_HANDLER, r);
if ((retval == DECLINED) && r->content_type) {
r->handler = r->content_type; /* let http_core or whatever try */
1.31 +21 -16 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- modperl_callback.c 2001/03/16 04:58:58 1.30
+++ modperl_callback.c 2001/03/16 05:08:15 1.31
@@ -91,8 +91,8 @@
return status;
}
-int modperl_run_handlers(int idx, request_rec *r, conn_rec *c,
- server_rec *s, int type, ...)
+int modperl_callback_run_handlers(int idx, request_rec *r, conn_rec *c,
+ server_rec *s, int type, ...)
{
#ifdef USE_ITHREADS
pTHX;
@@ -230,33 +230,38 @@
return status;
}
-int modperl_per_dir_callback(int idx, request_rec *r)
+int modperl_callback_per_dir(int idx, request_rec *r)
{
- return modperl_run_handlers(idx, r, NULL, r->server,
- MP_HANDLER_TYPE_PER_DIR);
+ return modperl_callback_run_handlers(idx, r, NULL,
+ r->server,
+ MP_HANDLER_TYPE_PER_DIR);
}
-int modperl_per_srv_callback(int idx, request_rec *r)
+int modperl_callback_per_srv(int idx, request_rec *r)
{
- return modperl_run_handlers(idx, r, NULL, r->server,
- MP_HANDLER_TYPE_PER_SRV);
+ return modperl_callback_run_handlers(idx, r, NULL,
+ r->server,
+ MP_HANDLER_TYPE_PER_SRV);
}
-int modperl_connection_callback(int idx, conn_rec *c)
+int modperl_callback_connection(int idx, conn_rec *c)
{
- return modperl_run_handlers(idx, NULL, c, c->base_server,
- MP_HANDLER_TYPE_CONNECTION);
+ return modperl_callback_run_handlers(idx, NULL, c,
+ c->base_server,
+ MP_HANDLER_TYPE_CONNECTION);
}
-void modperl_process_callback(int idx, apr_pool_t *p, server_rec *s)
+void modperl_callback_process(int idx, apr_pool_t *p, server_rec *s)
{
- modperl_run_handlers(idx, NULL, NULL, s, MP_HANDLER_TYPE_PROCESS, p);
+ modperl_callback_run_handlers(idx, NULL, NULL, s,
+ MP_HANDLER_TYPE_PROCESS, p);
}
-void modperl_files_callback(int idx,
+void modperl_callback_files(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_FILES,
- pconf, plog, ptemp);
+ modperl_callback_run_handlers(idx, NULL, NULL, s,
+ MP_HANDLER_TYPE_FILES,
+ pconf, plog, ptemp);
}
1.17 +9 -9 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- modperl_callback.h 2001/03/16 04:58:59 1.16
+++ modperl_callback.h 2001/03/16 05:08:15 1.17
@@ -13,19 +13,19 @@
int modperl_callback(pTHX_ modperl_handler_t *handler, apr_pool_t *p,
server_rec *s, AV *args);
-int modperl_run_handlers(int idx, request_rec *r, conn_rec *c,
- server_rec *s, int type, ...);
+int modperl_callback_run_handlers(int idx, request_rec *r, conn_rec *c,
+ server_rec *s, int type, ...);
-void modperl_process_callback(int idx, apr_pool_t *p, server_rec *s);
+int modperl_callback_per_dir(int idx, request_rec *r);
-void modperl_files_callback(int idx,
- apr_pool_t *pconf, apr_pool_t *plog,
- apr_pool_t *ptemp, server_rec *s);
+int modperl_callback_per_srv(int idx, request_rec *r);
-int modperl_per_dir_callback(int idx, request_rec *r);
+int modperl_callback_connection(int idx, conn_rec *c);
-int modperl_per_srv_callback(int idx, request_rec *r);
+void modperl_callback_process(int idx, apr_pool_t *p, server_rec *s);
-int modperl_connection_callback(int idx, conn_rec *c);
+void modperl_callback_files(int idx,
+ apr_pool_t *pconf, apr_pool_t *plog,
+ apr_pool_t *ptemp, server_rec *s);
#endif /* MODPERL_CALLBACK_H */
