Convert the filter and brigade writing functions to return status values,

not byte counts.

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

diff --git a/include/util_filter.h b/include/util_filter.h
index 17e5c0acadf2b96ff4c9c9c4fd469c65fc657351..430e9ee945c3215f8cbb88f5094be6c99a0b6c8c 100644 (file)
--- a/include/util_filter.h
+++ b/include/util_filter.h
@@ -431,7 +431,9 @@ AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb);
  * @param bb The brigade to buffer into
  * @param ... The strings to write
  */
-AP_DECLARE_NONSTD(int) ap_fputstrs(ap_filter_t *f, apr_bucket_brigade *bb, ...);
+AP_DECLARE_NONSTD(apr_status_t) ap_fputstrs(ap_filter_t *f,
+                                            apr_bucket_brigade *bb,
+                                            ...);
 
 /**
  * Output data to the filter in printf format
@@ -440,7 +442,10 @@ AP_DECLARE_NONSTD(int) ap_fputstrs(ap_filter_t *f, apr_bucket_brigade *bb, ...);
  * @param fmt The format string
  * @param ... The argumets to use to fill out the format string
  */
-AP_DECLARE_NONSTD(int) ap_fprintf(ap_filter_t *f, apr_bucket_brigade *bb, const char *fmt, ...)
+AP_DECLARE_NONSTD(apr_status_t) ap_fprintf(ap_filter_t *f,
+                                           apr_bucket_brigade *bb,
+                                           const char *fmt,
+                                           ...)
         __attribute__((format(printf,3,4)));                                    
 
 #ifdef __cplusplus

diff --git a/server/util_filter.c b/server/util_filter.c
index 338ae8beae23361195cb821efc7dc387e94faa9c..8e8f77073603cc46a31a6344ad67e9c3337163ae 100644 (file)
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -289,24 +289,29 @@ AP_DECLARE(apr_status_t) ap_fflush(ap_filter_t *f, apr_bucket_brigade *bb)
     return ap_pass_brigade(f, bb);
 }
 
-AP_DECLARE_NONSTD(int) ap_fputstrs(ap_filter_t *f, apr_bucket_brigade *bb, ...)
+AP_DECLARE_NONSTD(apr_status_t) ap_fputstrs(ap_filter_t *f,
+                                            apr_bucket_brigade *bb, ...)
 {
     va_list args;
-    int res;
+    apr_status_t rv;
 
     va_start(args, bb);
-    res = apr_brigade_vputstrs(bb, ap_filter_flush, f, args);
+    rv = apr_brigade_vputstrs(bb, ap_filter_flush, f, args);
     va_end(args);
-    return res;
+    return rv;
 }
 
-AP_DECLARE_NONSTD(int) ap_fprintf(ap_filter_t *f, apr_bucket_brigade *bb, const char *fmt, ...){
+AP_DECLARE_NONSTD(apr_status_t) ap_fprintf(ap_filter_t *f,
+                                           apr_bucket_brigade *bb,
+                                           const char *fmt,
+                                           ...)
+{
     va_list args;
-    int res;
+    apr_status_t rv;
 
     va_start(args, fmt);
-    res = apr_brigade_vprintf(bb, ap_filter_flush, f, fmt, args);
+    rv = apr_brigade_vprintf(bb, ap_filter_flush, f, fmt, args);
     va_end(args);
-    return res;
+    return rv;
 }