svn commit: r985497 - /subversion/branches/performance/subversion/libsvn_subr/stream.c

[st...@apache.org]

Author: stefan2
Date: Sat Aug 14 14:26:42 2010
New Revision: 985497

URL: http://svn.apache.org/viewvc?rev=985497&view=rev
Log:
Follow-up to r985487: There is still a case where we have to actively suppress EOF.
(This one got lost by me reformatting the code)

* subversion/libsvn_subr/stream.c
  (read_handler_apr): we still need to filter EOF errors for the getc() case

Modified:
    subversion/branches/performance/subversion/libsvn_subr/stream.c

Modified: subversion/branches/performance/subversion/libsvn_subr/stream.c
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/libsvn_subr/stream.c?rev=985497&r1=985496&r2=985497&view=diff
==============================================================================
--- subversion/branches/performance/subversion/libsvn_subr/stream.c (original)
+++ subversion/branches/performance/subversion/libsvn_subr/stream.c Sat Aug 14 14:26:42 2010
@@ -604,7 +604,14 @@ read_handler_apr(void *baton, char *buff
     {
       err = svn_io_file_getc (buffer, btn->file, btn->pool);
       if (err)
-        *len = 0;
+        {
+          *len = 0;
+          if (APR_STATUS_IS_EOF(err->apr_err))
+            {
+              svn_error_clear(err);
+              err = SVN_NO_ERROR;
+            }
+        }
     }
     else
       err = svn_io_file_read_full2(btn->file, buffer, *len, len,