stas 2004/05/21 15:01:17
Modified: . Changes
t/conf modperl_extra.pl
t/filter/TestFilter both_str_con_add.pm in_bbs_body.pm
in_bbs_inject_header.pm in_bbs_msg.pm
t/protocol/TestProtocol echo_filter.pm
t/response/TestAPR bucket.pm
xs/APR/Brigade APR__Brigade.h
xs/maps apr_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
rename empty => is_empty
Revision Changes Path
1.376 +3 -1 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -u -r1.375 -r1.376
--- Changes 21 May 2004 19:28:32 -0000 1.375
+++ Changes 21 May 2004 22:01:16 -0000 1.376
@@ -12,13 +12,15 @@
=item 1.99_15-dev
-rename APR::NetLib -> APR::IpSubnet to match the class name [Stas]
+rename package APR::NetLib -> APR::IpSubnet to match the class name
+[Stas]
APR::BucketType: [Stas]
- name is readonly
APR::Brigade [Stas]
- destroy() now throws APR::Error exception (not returning rc)
+ - rename empty => is_empty
APR::Bucket: [Stas]
- read() now returns read data and throws APR::Error exception (not
1.49 +2 -2 modperl-2.0/t/conf/modperl_extra.pl
Index: modperl_extra.pl
===================================================================
RCS file: /home/cvs/modperl-2.0/t/conf/modperl_extra.pl,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -u -r1.48 -r1.49
--- modperl_extra.pl 21 May 2004 18:40:49 -0000 1.48
+++ modperl_extra.pl 21 May 2004 22:01:16 -0000 1.49
@@ -148,7 +148,7 @@
warn "read_post: bb $count\n" if $debug;
- while (!$bb->empty) {
+ while (!$bb->is_empty) {
my $b = $bb->first;
$b->remove;
@@ -251,7 +251,7 @@
my $rv = $filter->next->pass_brigade($bb);
return $rv unless $rv == APR::SUCCESS;
}
- #if ($bb->empty) {
+ #if ($bb->is_empty) {
# return -1;
#}
1.12 +1 -1 modperl-2.0/t/filter/TestFilter/both_str_con_add.pm
Index: both_str_con_add.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/both_str_con_add.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- both_str_con_add.pm 7 May 2004 03:46:27 -0000 1.11
+++ both_str_con_add.pm 21 May 2004 22:01:16 -0000 1.12
@@ -70,7 +70,7 @@
last;
}
- last if $bb->empty;
+ last if $bb->is_empty;
my $b = APR::Bucket::flush_create($c->bucket_alloc);
$bb->insert_tail($b);
1.4 +1 -1 modperl-2.0/t/filter/TestFilter/in_bbs_body.pm
Index: in_bbs_body.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/in_bbs_body.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- in_bbs_body.pm 21 May 2004 18:40:50 -0000 1.3
+++ in_bbs_body.pm 21 May 2004 22:01:16 -0000 1.4
@@ -27,7 +27,7 @@
return $rv;
}
- while (!$ctx_bb->empty) {
+ while (!$ctx_bb->is_empty) {
my $bucket = $ctx_bb->first;
$bucket->remove;
1.8 +1 -1 modperl-2.0/t/filter/TestFilter/in_bbs_inject_header.pm
Index: in_bbs_inject_header.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/in_bbs_inject_header.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- in_bbs_inject_header.pm 21 May 2004 18:40:50 -0000 1.7
+++ in_bbs_inject_header.pm 21 May 2004 22:01:16 -0000 1.8
@@ -155,7 +155,7 @@
my $rv = $filter->next->get_brigade($ctx_bb, $mode, $block, $readbytes);
return $rv unless $rv == APR::SUCCESS;
- while (!$ctx_bb->empty) {
+ while (!$ctx_bb->is_empty) {
my $bucket = $ctx_bb->first;
$bucket->remove;
1.8 +1 -1 modperl-2.0/t/filter/TestFilter/in_bbs_msg.pm
Index: in_bbs_msg.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/in_bbs_msg.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- in_bbs_msg.pm 21 May 2004 18:40:50 -0000 1.7
+++ in_bbs_msg.pm 21 May 2004 22:01:16 -0000 1.8
@@ -31,7 +31,7 @@
return $rv;
}
- while (!$ctx_bb->empty) {
+ while (!$ctx_bb->is_empty) {
my $bucket = $ctx_bb->first;
$bucket->remove;
1.11 +1 -1 modperl-2.0/t/protocol/TestProtocol/echo_filter.pm
Index: echo_filter.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/protocol/TestProtocol/echo_filter.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- echo_filter.pm 7 May 2004 03:46:27 -0000 1.10
+++ echo_filter.pm 21 May 2004 22:01:16 -0000 1.11
@@ -33,7 +33,7 @@
last;
}
- last if $bb->empty;
+ last if $bb->is_empty;
my $b = APR::Bucket::flush_create($c->bucket_alloc);
$bb->insert_tail($b);
1.2 +2 -2 modperl-2.0/t/response/TestAPR/bucket.pm
Index: bucket.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPR/bucket.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- bucket.pm 21 May 2004 18:38:51 -0000 1.1
+++ bucket.pm 21 May 2004 22:01:16 -0000 1.2
@@ -152,14 +152,14 @@
ok $b->is_flush;
t_debug("not empty");
- ok !$bb->empty;
+ ok !$bb->is_empty;
# remove all buckets from bb and test that it's empty
for (my $b = $bb->first; $b; $b = $bb->next($b)) {
$b->remove;
}
t_debug("empty");
- ok $bb->empty;
+ ok $bb->is_empty;
}
# check for non-existing buckets first/next/last
1.12 +1 -1 modperl-2.0/xs/APR/Brigade/APR__Brigade.h
Index: APR__Brigade.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/Brigade/APR__Brigade.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- APR__Brigade.h 21 May 2004 18:34:36 -0000 1.11
+++ APR__Brigade.h 21 May 2004 22:01:16 -0000 1.12
@@ -77,7 +77,7 @@
}
static MP_INLINE
-int mpxs_APR__Brigade_empty(apr_bucket_brigade *brigade)
+int mpxs_APR__Brigade_is_empty(apr_bucket_brigade *brigade)
{
return APR_BRIGADE_EMPTY(brigade);
}
1.77 +1 -1 modperl-2.0/xs/maps/apr_functions.map
Index: apr_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/apr_functions.map,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -u -r1.76 -r1.77
--- apr_functions.map 21 May 2004 19:25:46 -0000 1.76
+++ apr_functions.map 21 May 2004 22:01:16 -0000 1.77
@@ -101,7 +101,7 @@
mpxs_APR__Brigade_insert_tail #APR_BRIGADE_INSERT_TAIL
mpxs_APR__Brigade_insert_head #APR_BRIGADE_INSERT_HEAD
mpxs_APR__Brigade_concat #APR_BRIGADE_CONCAT
- mpxs_APR__Brigade_empty #APR_BRIGADE_EMPTY
+ mpxs_APR__Brigade_is_empty #APR_BRIGADE_EMPTY
mpxs_APR__Brigade_length | | bb, read_all=1
mpxs_APR__Brigade_flatten | | ...
mpxs_APR__Brigade_pool
1.158 +11 -11 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.157
retrieving revision 1.158
diff -u -u -r1.157 -r1.158
--- FunctionTable.pm 21 May 2004 18:37:21 -0000 1.157
+++ FunctionTable.pm 21 May 2004 22:01:16 -0000 1.158
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Fri May 21 02:04:32 2004
+# ! Fri May 21 14:50:13 2004
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -5179,16 +5179,6 @@
]
},
{
- 'return_type' => 'int',
- 'name' => 'mpxs_APR__Brigade_empty',
- 'args' => [
- {
- 'type' => 'apr_bucket_brigade *',
- 'name' => 'brigade'
- }
- ]
- },
- {
'return_type' => 'apr_bucket *',
'name' => 'mpxs_APR__Brigade_first',
'args' => [
@@ -5245,6 +5235,16 @@
{
'type' => 'apr_bucket *',
'name' => 'bucket'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'int',
+ 'name' => 'mpxs_APR__Brigade_is_empty',
+ 'args' => [
+ {
+ 'type' => 'apr_bucket_brigade *',
+ 'name' => 'brigade'
}
]
},
