Commit f03d203d authored by Doug MacEachern's avatar Doug MacEachern
Browse files

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
parent d19b4ffd

include/http_protocol.h

+4 −4
Original line number Diff line number Diff line
@@ -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

modules/http/error_bucket.c

+3 −3
Original line number Diff line number Diff line
@@ -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 = {

modules/http/http_protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -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);