Author: stefan2 Date: Wed Aug 4 20:22:10 2010 New Revision: 982391 URL: http://svn.apache.org/viewvc?rev=982391&view=rev Log: Upon second thought, svn_stream_from_aprfile3 should be renamed to svn_stream_from_cached_file_handle.
* subversion/include/svn_io.h (svn_stream_from_cached_file_handle): renamed from svn_stream_from_aprfile3 * subversion/libvn_subr/stream.c (svn_stream_from_cached_file_handle): renamed from svn_stream_from_aprfile3 Modified: subversion/branches/performance/subversion/include/svn_io.h subversion/branches/performance/subversion/libsvn_subr/stream.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=982391&r1=982390&r2=982391&view=diff ============================================================================== --- subversion/branches/performance/subversion/include/svn_io.h (original) +++ subversion/branches/performance/subversion/include/svn_io.h Wed Aug 4 20:22:10 2010 @@ -926,23 +926,6 @@ svn_stream_from_aprfile2(apr_file_t *fil /* "forward-declare" svn_file_handle_cache__handle_t */ struct svn_file_handle_cache__handle_t; -/** Create a stream from a cached file handle. For convenience, if @a file - * is @c NULL, an empty stream created by svn_stream_empty() is returned. - * - * This function should normally be called with @a disown set to FALSE, - * in which case closing the stream will also return the file handle to - * the respective cache object. - * - * If @a disown is TRUE, the stream will disown the file handle, meaning - * that svn_stream_close() will not close the cached file handle. - * - * @since New in 1.7. - */ -svn_stream_t * -svn_stream_from_aprfile3(struct svn_file_handle_cache__handle_t *file, - svn_boolean_t disown, - apr_pool_t *pool); - /** Similar to svn_stream_from_aprfile2(), except that the file will * always be disowned. * @@ -957,6 +940,24 @@ svn_stream_t * svn_stream_from_aprfile(apr_file_t *file, apr_pool_t *pool); +/** Create a stream from a cached file handle. For convenience, if @a file + * is @c NULL, an empty stream created by svn_stream_empty() is returned. + * + * This function should normally be called with @a disown set to FALSE, + * in which case closing the stream will also return the file handle to + * the respective cache object. + * + * If @a disown is TRUE, the stream will disown the file handle, meaning + * that svn_stream_close() will not close the cached file handle. + * + * @since New in 1.7. + */ +svn_stream_t * +svn_stream_from_cached_file_handle + (struct svn_file_handle_cache__handle_t *file, + svn_boolean_t disown, + apr_pool_t *pool); + /** Create a stream for reading from a range of an APR file. * The stream cannot be written to. * Modified: subversion/branches/performance/subversion/libsvn_subr/stream.c URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/libsvn_subr/stream.c?rev=982391&r1=982390&r2=982391&view=diff ============================================================================== --- subversion/branches/performance/subversion/libsvn_subr/stream.c (original) +++ subversion/branches/performance/subversion/libsvn_subr/stream.c Wed Aug 4 20:22:10 2010 @@ -782,9 +782,9 @@ svn_stream_from_aprfile2(apr_file_t *fil } svn_stream_t * -svn_stream_from_aprfile3(svn_file_handle_cache__handle_t *file, - svn_boolean_t disown, - apr_pool_t *pool) +svn_stream_from_cached_file_handle(svn_file_handle_cache__handle_t *file, + svn_boolean_t disown, + apr_pool_t *pool) { struct baton_apr *baton;