You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/08/17 23:25:29 UTC

svn commit: r986491 - /subversion/branches/performance/subversion/libsvn_subr/io.c

Author: stefan2
Date: Tue Aug 17 21:25:28 2010
New Revision: 986491

URL: http://svn.apache.org/viewvc?rev=986491&view=rev
Log:
Implement the deprecated svn_io_file_read_full as a wrapper around
svn_io_file_read_full2.

* subversion/libsvn_subr/io.c
  (svn_io_file_read_full): re-implement as simply calling svn_io_file_read_full2

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

Modified: subversion/branches/performance/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/libsvn_subr/io.c?rev=986491&r1=986490&r2=986491&view=diff
==============================================================================
--- subversion/branches/performance/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/performance/subversion/libsvn_subr/io.c Tue Aug 17 21:25:28 2010
@@ -2914,23 +2914,10 @@ svn_io_file_read(apr_file_t *file, void 
 
 
 svn_error_t *
-svn_io_file_read_full(apr_file_t *file, void *buf,
-                      apr_size_t nbytes, apr_size_t *bytes_read,
-                      apr_pool_t *pool)
-{
-  return do_io_file_wrapper_cleanup
-    (file, apr_file_read_full(file, buf, nbytes, bytes_read),
-     N_("Can't read file '%s'"),
-     N_("Can't read stream"),
-     pool);
-}
-
-
-svn_error_t *
 svn_io_file_read_full2(apr_file_t *file, void *buf,
-                       apr_size_t nbytes, apr_size_t *bytes_read,
-                       svn_boolean_t eof_is_ok,
-                       apr_pool_t *pool)
+                        apr_size_t nbytes, apr_size_t *bytes_read,
+                        svn_boolean_t eof_is_ok,
+                        apr_pool_t *pool)
 {
   apr_status_t status = apr_file_read_full(file, buf, nbytes, bytes_read);
   if (APR_STATUS_IS_EOF(status) && eof_is_ok)
@@ -2945,6 +2932,15 @@ svn_io_file_read_full2(apr_file_t *file,
 
 
 svn_error_t *
+svn_io_file_read_full(apr_file_t *file, void *buf,
+                      apr_size_t nbytes, apr_size_t *bytes_read,
+                      apr_pool_t *pool)
+{
+  return svn_io_file_read_full2(file, buf, nbytes, bytes_read, FALSE, pool);
+}
+
+
+svn_error_t *
 svn_io_file_seek(apr_file_t *file, apr_seek_where_t where,
                  apr_off_t *offset, apr_pool_t *pool)
 {