svn commit: r1487528 - /httpd/httpd/trunk/server/protocol.c

[jo...@apache.org]

Author: jorton
Date: Wed May 29 16:09:24 2013
New Revision: 1487528

URL: http://svn.apache.org/r1487528
Log:
* server/protocol.c (r_flush): Use int return type as per declaration
  of apr_vformatter(); no functional change.

Modified:
    httpd/httpd/trunk/server/protocol.c

Modified: httpd/httpd/trunk/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?rev=1487528&r1=1487527&r2=1487528&view=diff
==============================================================================
--- httpd/httpd/trunk/server/protocol.c (original)
+++ httpd/httpd/trunk/server/protocol.c Wed May 29 16:09:24 2013
@@ -1670,7 +1670,8 @@ struct ap_vrprintf_data {
     char *buff;
 };
 
-static apr_status_t r_flush(apr_vformatter_buff_t *buff)
+/* Flush callback for apr_vformatter; returns -1 on error. */
+static int r_flush(apr_vformatter_buff_t *buff)
 {
     /* callback function passed to ap_vformatter to be called when
      * vformatter needs to write into buff and buff.curpos > buff.endpos */
@@ -1691,7 +1692,7 @@ static apr_status_t r_flush(apr_vformatt
     vd->vbuff.curpos = vd->buff;
     vd->vbuff.endpos = vd->buff + AP_IOBUFSIZE;
 
-    return APR_SUCCESS;
+    return 0;
 }
 
 AP_DECLARE(int) ap_vrprintf(request_rec *r, const char *fmt, va_list va)