You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by st...@apache.org on 2003/01/12 03:15:59 UTC
cvs commit: modperl-2.0/src/modules/perl modperl_filter.h mod_perl.c modperl_filter.c
stas 2003/01/11 18:15:59
Modified: xs/tables/current/ModPerl FunctionTable.pm
src/modules/perl modperl_filter.h mod_perl.c
modperl_filter.c
Log:
improve the code readability by s/filter_register/filter_add/g because the
filters are actually inserted, not just registered
Revision Changes Path
1.91 +4 -4 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- FunctionTable.pm 11 Jan 2003 00:02:16 -0000 1.90
+++ FunctionTable.pm 12 Jan 2003 02:15:58 -0000 1.91
@@ -2322,7 +2322,7 @@
},
{
'return_type' => 'void',
- 'name' => 'modperl_input_filter_register_connection',
+ 'name' => 'modperl_input_filter_add_connection',
'args' => [
{
'type' => 'conn_rec *',
@@ -2332,7 +2332,7 @@
},
{
'return_type' => 'void',
- 'name' => 'modperl_input_filter_register_request',
+ 'name' => 'modperl_input_filter_add_request',
'args' => [
{
'type' => 'request_rec *',
@@ -3177,7 +3177,7 @@
},
{
'return_type' => 'void',
- 'name' => 'modperl_output_filter_register_connection',
+ 'name' => 'modperl_output_filter_add_connection',
'args' => [
{
'type' => 'conn_rec *',
@@ -3187,7 +3187,7 @@
},
{
'return_type' => 'void',
- 'name' => 'modperl_output_filter_register_request',
+ 'name' => 'modperl_output_filter_add_request',
'args' => [
{
'type' => 'request_rec *',
1.15 +4 -4 modperl-2.0/src/modules/perl/modperl_filter.h
Index: modperl_filter.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- modperl_filter.h 30 May 2002 02:33:48 -0000 1.14
+++ modperl_filter.h 12 Jan 2003 02:15:58 -0000 1.15
@@ -37,9 +37,9 @@
apr_status_t modperl_output_filter_handler(ap_filter_t *f,
apr_bucket_brigade *bb);
-void modperl_output_filter_register_connection(conn_rec *c);
+void modperl_output_filter_add_connection(conn_rec *c);
-void modperl_output_filter_register_request(request_rec *r);
+void modperl_output_filter_add_request(request_rec *r);
MP_INLINE apr_status_t modperl_output_filter_flush(modperl_filter_t *filter);
@@ -61,8 +61,8 @@
apr_read_type_e block,
apr_off_t readbytes);
-void modperl_input_filter_register_connection(conn_rec *c);
+void modperl_input_filter_add_connection(conn_rec *c);
-void modperl_input_filter_register_request(request_rec *r);
+void modperl_input_filter_add_request(request_rec *r);
#endif /* MODPERL_FILTER_H */
1.146 +4 -4 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.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- mod_perl.c 12 Dec 2002 10:05:07 -0000 1.145
+++ mod_perl.c 12 Jan 2003 02:15:58 -0000 1.146
@@ -481,8 +481,8 @@
static int modperl_hook_pre_connection(conn_rec *c, void *csd)
{
- modperl_input_filter_register_connection(c);
- modperl_output_filter_register_connection(c);
+ modperl_input_filter_add_connection(c);
+ modperl_output_filter_add_connection(c);
return OK;
}
@@ -595,10 +595,10 @@
ap_hook_handler(modperl_response_handler_cgi,
NULL, NULL, APR_HOOK_MIDDLE);
- ap_hook_insert_filter(modperl_output_filter_register_request,
+ ap_hook_insert_filter(modperl_output_filter_add_request,
NULL, NULL, APR_HOOK_LAST);
- ap_hook_insert_filter(modperl_input_filter_register_request,
+ ap_hook_insert_filter(modperl_input_filter_add_request,
NULL, NULL, APR_HOOK_LAST);
ap_register_output_filter(MP_FILTER_REQUEST_OUTPUT_NAME,
1.41 +38 -38 modperl-2.0/src/modules/perl/modperl_filter.c
Index: modperl_filter.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- modperl_filter.c 25 Nov 2002 22:47:39 -0000 1.40
+++ modperl_filter.c 12 Jan 2003 02:15:58 -0000 1.41
@@ -443,11 +443,11 @@
typedef ap_filter_t * MP_FUNC_T(filter_add_t) (const char *, void *,
request_rec *, conn_rec *);
-static int modperl_filter_register_connection(conn_rec *c,
- int idx,
- const char *name,
- filter_add_t addfunc,
- const char *type)
+static int modperl_filter_add_connection(conn_rec *c,
+ int idx,
+ const char *name,
+ filter_add_t addfunc,
+ const char *type)
{
modperl_config_dir_t *dcfg =
modperl_config_dir_get_defaults(c->base_server);
@@ -483,12 +483,12 @@
return DECLINED;
}
-static int modperl_filter_register_request(request_rec *r,
- int idx,
- const char *name,
- filter_add_t addfunc,
- const char *type,
- ap_filter_t *filters)
+static int modperl_filter_add_request(request_rec *r,
+ int idx,
+ const char *name,
+ filter_add_t addfunc,
+ const char *type,
+ ap_filter_t *filters)
{
MP_dDCFG;
MpAV *av;
@@ -510,7 +510,7 @@
((modperl_filter_ctx_t *)f->ctx)->handler;
if (modperl_handler_equal(ctx_handler, handlers[i])) {
- /* skip if modperl_filter_register_connection
+ /* skip if modperl_filter_add_connection
* already registered this handler
* XXX: set a flag in the modperl_handler_t instead
*/
@@ -546,42 +546,42 @@
return DECLINED;
}
-void modperl_output_filter_register_connection(conn_rec *c)
+void modperl_output_filter_add_connection(conn_rec *c)
{
- modperl_filter_register_connection(c,
- MP_OUTPUT_FILTER_HANDLER,
- MP_FILTER_CONNECTION_OUTPUT_NAME,
- ap_add_output_filter,
- "OutputFilter");
+ modperl_filter_add_connection(c,
+ MP_OUTPUT_FILTER_HANDLER,
+ MP_FILTER_CONNECTION_OUTPUT_NAME,
+ ap_add_output_filter,
+ "OutputFilter");
}
-void modperl_output_filter_register_request(request_rec *r)
+void modperl_output_filter_add_request(request_rec *r)
{
- modperl_filter_register_request(r,
- MP_OUTPUT_FILTER_HANDLER,
- MP_FILTER_REQUEST_OUTPUT_NAME,
- ap_add_output_filter,
- "OutputFilter",
- r->connection->output_filters);
+ modperl_filter_add_request(r,
+ MP_OUTPUT_FILTER_HANDLER,
+ MP_FILTER_REQUEST_OUTPUT_NAME,
+ ap_add_output_filter,
+ "OutputFilter",
+ r->connection->output_filters);
}
-void modperl_input_filter_register_connection(conn_rec *c)
+void modperl_input_filter_add_connection(conn_rec *c)
{
- modperl_filter_register_connection(c,
- MP_INPUT_FILTER_HANDLER,
- MP_FILTER_CONNECTION_INPUT_NAME,
- ap_add_input_filter,
- "InputFilter");
+ modperl_filter_add_connection(c,
+ MP_INPUT_FILTER_HANDLER,
+ MP_FILTER_CONNECTION_INPUT_NAME,
+ ap_add_input_filter,
+ "InputFilter");
}
-void modperl_input_filter_register_request(request_rec *r)
+void modperl_input_filter_add_request(request_rec *r)
{
- modperl_filter_register_request(r,
- MP_INPUT_FILTER_HANDLER,
- MP_FILTER_REQUEST_INPUT_NAME,
- ap_add_input_filter,
- "InputFilter",
- r->connection->input_filters);
+ modperl_filter_add_request(r,
+ MP_INPUT_FILTER_HANDLER,
+ MP_FILTER_REQUEST_INPUT_NAME,
+ ap_add_input_filter,
+ "InputFilter",
+ r->connection->input_filters);
}
void modperl_brigade_dump(apr_bucket_brigade *bb, FILE *fp)