diff options
| author | Cliff Woolley <jwoolley@apache.org> | 2001-02-26 00:08:52 +0100 |
|---|---|---|
| committer | Cliff Woolley <jwoolley@apache.org> | 2001-02-26 00:08:52 +0100 |
| commit | 93fe62dd770c082a8d0092ca34640deb5122fcaa (patch) | |
| tree | d1fee9f6b57e0e8367b67cb9a99d663aa19505e6 /modules/experimental/mod_charset_lite.c | |
| parent | A patch to clean up much bogusity in Win32. Eliminates absolute cd "/..." (diff) | |
| download | apache2-93fe62dd770c082a8d0092ca34640deb5122fcaa.tar.xz apache2-93fe62dd770c082a8d0092ca34640deb5122fcaa.zip | |
Simplify by using apr_bucket_delete(e) where possible.
(Oh, plus one tiny little loop simplification.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88337 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/experimental/mod_charset_lite.c')
| -rw-r--r-- | modules/experimental/mod_charset_lite.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/modules/experimental/mod_charset_lite.c b/modules/experimental/mod_charset_lite.c index 6a5b713eb3..096fba3f1a 100644 --- a/modules/experimental/mod_charset_lite.c +++ b/modules/experimental/mod_charset_lite.c @@ -743,8 +743,7 @@ static apr_status_t xlate_brigade(charset_filter_ctx_t *ctx, while (1) { if (!bucket_avail) { /* no bytes left to process in the current bucket... */ if (consumed_bucket) { - APR_BUCKET_REMOVE(consumed_bucket); - apr_bucket_destroy(consumed_bucket); + apr_bucket_delete(consumed_bucket); consumed_bucket = NULL; } b = APR_BRIGADE_FIRST(bb); @@ -802,8 +801,7 @@ static apr_status_t xlate_brigade(charset_filter_ctx_t *ctx, if (bucket_avail) { apr_bucket_split(b, bytes_in_bucket - bucket_avail); } - APR_BUCKET_REMOVE(b); - apr_bucket_destroy(b); + apr_bucket_delete(b); break; } } @@ -894,8 +892,7 @@ static apr_status_t xlate_out_filter(ap_filter_t *f, apr_bucket_brigade *bb) while (!done) { if (!cur_len) { /* no bytes left to process in the current bucket... */ if (consumed_bucket) { - APR_BUCKET_REMOVE(consumed_bucket); - apr_bucket_destroy(consumed_bucket); + apr_bucket_delete(consumed_bucket); consumed_bucket = NULL; } if (dptr == APR_BRIGADE_SENTINEL(bb)) { |