rename:

ap_bucket_create_error -> ap_bucket_error_create
ap_bucket_make_error   -> ap_bucket_error_make
PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88142 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/http_protocol.h b/include/http_protocol.h
index 36c409ab9aa061586f8a8f6c7874ec4d65bfe146..7acb89e8bbf5f10de498ebb677b46a49e05c8535 100644 (file)
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -576,9 +576,9 @@ AP_DECLARE_DATA extern const apr_bucket_type_t ap_bucket_type_error;
  * @param buf An optional error string to put in the bucket.
  * @param p A pool to allocate out of.
  * @return The new bucket, or NULL if allocation failed
- * @deffunc apr_bucket *ap_bucket_make_error(apr_bucket *b, int error, const char *buf, apr_pool_t *p)
+ * @deffunc apr_bucket *ap_bucket_error_make(apr_bucket *b, int error, const char *buf, apr_pool_t *p)
  */
-AP_DECLARE(apr_bucket *) ap_bucket_make_error(apr_bucket *b, int error,
+AP_DECLARE(apr_bucket *) ap_bucket_error_make(apr_bucket *b, int error,
                 const char *buf, apr_pool_t *p);
 
 /**
@@ -587,9 +587,9 @@ AP_DECLARE(apr_bucket *) ap_bucket_make_error(apr_bucket *b, int error,
  * @param buf An optional error string to put in the bucket.
  * @param p A pool to allocate out of.
  * @return The new bucket, or NULL if allocation failed
- * @deffunc apr_bucket *ap_bucket_create_error(int error, const char *buf, apr_pool_t *p)
+ * @deffunc apr_bucket *ap_bucket_error_create(int error, const char *buf, apr_pool_t *p)
  */
-AP_DECLARE(apr_bucket *) ap_bucket_create_error(int error,
+AP_DECLARE(apr_bucket *) ap_bucket_error_create(int error,
                 const char *buf, apr_pool_t *p);
 
 #ifdef __cplusplus

diff --git a/modules/http/error_bucket.c b/modules/http/error_bucket.c
index 38b39f892791e1dd69c7a33e5e5367290e7bc2f0..8d69a5a6ec78f8aed081b6f134ac021a55ab3766 100644 (file)
--- a/modules/http/error_bucket.c
+++ b/modules/http/error_bucket.c
@@ -68,7 +68,7 @@ static apr_status_t error_read(apr_bucket *b, const char **str,
     return APR_SUCCESS;
 }
 
-AP_DECLARE(apr_bucket *) ap_bucket_make_error(apr_bucket *b, int error, 
+AP_DECLARE(apr_bucket *) ap_bucket_error_make(apr_bucket *b, int error, 
                const char *buf, apr_pool_t *p)
 {
     ap_bucket_error *h;
@@ -88,10 +88,10 @@ AP_DECLARE(apr_bucket *) ap_bucket_make_error(apr_bucket *b, int error,
     return b;
 }
 
-AP_DECLARE(apr_bucket *) ap_bucket_create_error(int error, 
+AP_DECLARE(apr_bucket *) ap_bucket_error_create(int error, 
                const char *buf, apr_pool_t *p)
 {
-    apr_bucket_do_create(ap_bucket_make_error(b, error, buf, p));
+    apr_bucket_do_create(ap_bucket_error_make(b, error, buf, p));
 }
 
 AP_DECLARE_DATA const apr_bucket_type_t ap_bucket_type_error = {

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index afdbb70178d703d2df44895c6643c24475dfcd6b..f901d92282f3ae2dac10d2ba8a2cbacabb426436 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -237,7 +237,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_byterange_filter(
         if (num_ranges == -1) {
             ap_remove_output_filter(f);
             bsend = apr_brigade_create(r->pool);
-            e = ap_bucket_create_error(HTTP_RANGE_NOT_SATISFIABLE, NULL, r->pool);
+            e = ap_bucket_error_create(HTTP_RANGE_NOT_SATISFIABLE, NULL, r->pool);
             APR_BRIGADE_INSERT_TAIL(bsend, e);
             e = apr_bucket_eos_create();
             APR_BRIGADE_INSERT_TAIL(bsend, e);