Commit 178a4202 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

A few small docs changes (there were ';' in the ScanDoc), and remove some 

very cool but totally unportable macros.  :-(


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

include/util_filter.h

+7 −9
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb); 
 * @param bb The brigade to buffer into

 * @param data The data to write

 * @param nbyte The number of bytes in the data

 * @deffunc int ap_fwrite(ap_filter_t *f, apr_bucket_brigade *bb, const char *data, apr_ssize_t nbyte);

 * @deffunc int ap_fwrite(ap_filter_t *f, apr_bucket_brigade *bb, const char *data, apr_ssize_t nbyte)

 */

#define ap_fwrite(f, bb, data, nbyte) \

	apr_brigade_write(bb, ap_filter_flush, (f)->next, data, nbyte)
@@ -426,7 +426,7 @@ AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb); 
 * @param f the filter doing the writing

 * @param bb The brigade to buffer into

 * @param str The string to write

 * @deffunc int ap_fputs(ap_filter_t *f, apr_bucket_brigade *bb, const char *str);

 * @deffunc int ap_fputs(ap_filter_t *f, apr_bucket_brigade *bb, const char *str)

 */

#define ap_fputs(f, bb, str) \

	apr_brigade_puts(bb, ap_filter_flush, (f)->next, str)
@@ -436,7 +436,7 @@ AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb); 
 * @param f the filter doing the writing

 * @param bb The brigade to buffer into

 * @param c The character to write

 * @deffunc int ap_fputc(ap_filter_t *f, apr_bucket_brigade *bb, char c);

 * @deffunc int ap_fputc(ap_filter_t *f, apr_bucket_brigade *bb, char c)

 */

#define ap_fputc(f, bb, c) \

	apr_brigade_putc(bb, ap_filter_flush, (f)->next, c)
@@ -446,10 +446,9 @@ AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb); 
 * @param f the filter doing the writing

 * @param bb The brigade to buffer into

 * @param ... The strings to write

 * @deffunc int ap_fputs(ap_filter_t *f, apr_bucket_brigade *bb, ...);

 * @deffunc int ap_fvputs(ap_filter_t *f, apr_bucket_brigade *bb, ...)

 */

#define ap_fvputs(f, bb, args...) \

	apr_brigade_putstrs(bb, ap_filter_flush, (f)->next, ##args)

AP_DECLARE_NONSTD(int) ap_fvputs(ap_filter_t *f, apr_bucket_brigade *bb, ...);



/**

 * Output data to the filter in printf format
@@ -457,10 +456,9 @@ AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb); 
 * @param bb The brigade to buffer into

 * @param fmt The format string

 * @param ... The argumets to use to fill out the format string

 * @deffunc int ap_fputs(ap_filter_t *f, apr_bucket_brigade *bb, const char *fmt, ...);

 * @deffunc int ap_fprintf(ap_filter_t *f, apr_bucket_brigade *bb, const char *fmt, ...)

 */

#define ap_fprintf(f, bb, fmt, args...) \

	apr_brigade_printf(bb, ap_filter_flush, (f)->next, fmt, ##args)

AP_DECLARE_NONSTD(int) ap_fprintf(ap_filter_t *f, apr_bucket_brigade *bb, const char *fmt, ...);



#ifdef __cplusplus

}

server/util_filter.c

+21 −0
Original line number Diff line number Diff line
@@ -282,3 +282,24 @@ AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb) 
    return ap_pass_brigade(f->next, bb);

}



AP_DECLARE(int) ap_fvputs(ap_filter_t *f, apr_bucket_brigade *bb, ...)

{

    va_list args;

    int res;



    va_start(args, bb);

    res = apr_brigade_vputstrs(bb, ap_filter_flush, f->next, args);

    va_end(args);

    return res;

}



AP_DECLARE(int) ap_fprintf(ap_filter_t *f, apr_bucket_brigade *bb, const char *fmt, ...){

    va_list args;

    int res;



    va_start(args, fmt);

    res = apr_brigade_vprintf(bb, ap_filter_flush, f->next, fmt, args);

    va_end(args);

    return res;

}