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/18 00:55:30 UTC
svn commit: r986517 - in /subversion/branches/performance/subversion:
include/svn_io.h libsvn_subr/deprecated.c libsvn_subr/io.c
Author: stefan2
Date: Tue Aug 17 22:55:30 2010
New Revision: 986517
URL: http://svn.apache.org/viewvc?rev=986517&view=rev
Log:
Final move to deprecate svn_io_file_read_full: Fix documentation
and move the old function to deprecated.c
* subversion/include/svn_io.h
(svn_io_file_read_full2): reformat commentary
(svn_io_file_read_full): document as diff to svn_io_file_read_full2
* subversion/libsvn_subr/io.c
(svn_io_file_read_full): remove
* subversion/libsvn_subr/deprecated.c
(svn_io_file_read_full): insert here
Modified:
subversion/branches/performance/subversion/include/svn_io.h
subversion/branches/performance/subversion/libsvn_subr/deprecated.c
subversion/branches/performance/subversion/libsvn_subr/io.c
Modified: subversion/branches/performance/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/svn_io.h?rev=986517&r1=986516&r2=986517&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/svn_io.h (original)
+++ subversion/branches/performance/subversion/include/svn_io.h Tue Aug 17 22:55:30 2010
@@ -1822,7 +1822,8 @@ svn_io_file_read(apr_file_t *file,
/** Wrapper for apr_file_read_full().
- * If eof_is_ok is set, no svn_error_t error object
+ *
+ * If @a eof_is_ok is set, no svn_error_t error object
* will be created upon EOF.
* @since New in 1.7
*/
@@ -1835,7 +1836,8 @@ svn_io_file_read_full2(apr_file_t *file,
apr_pool_t *pool);
-/** Wrapper for apr_file_read_full().
+/** Similar to svn_io_file_read_full2 with eof_is_ok being set
+ * to @c FALSE.
*
* @deprecated Provided for backward compatibility with the 1.6 API
*/
Modified: subversion/branches/performance/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/libsvn_subr/deprecated.c?rev=986517&r1=986516&r2=986517&view=diff
==============================================================================
--- subversion/branches/performance/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/branches/performance/subversion/libsvn_subr/deprecated.c Tue Aug 17 22:55:30 2010
@@ -751,6 +751,14 @@ svn_io_get_dirents(apr_hash_t **dirents,
return svn_io_get_dirents2(dirents, path, pool);
}
+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);
+}
+
/*** From constructors.c ***/
svn_log_changed_path_t *
Modified: subversion/branches/performance/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/libsvn_subr/io.c?rev=986517&r1=986516&r2=986517&view=diff
==============================================================================
--- subversion/branches/performance/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/performance/subversion/libsvn_subr/io.c Tue Aug 17 22:55:30 2010
@@ -2932,15 +2932,6 @@ 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)
{