diff options
Diffstat (limited to 'subversion/libsvn_subr/deprecated.c')
| -rw-r--r-- | subversion/libsvn_subr/deprecated.c | 55 |
1 files changed, 54 insertions, 1 deletions
diff --git a/subversion/libsvn_subr/deprecated.c b/subversion/libsvn_subr/deprecated.c index 68e3bd2cb3f98..1110d994bb79a 100644 --- a/subversion/libsvn_subr/deprecated.c +++ b/subversion/libsvn_subr/deprecated.c @@ -46,6 +46,7 @@ #include "svn_utf.h" #include "svn_xml.h" #include "svn_auth.h" +#include "svn_base64.h" #include "opt.h" #include "auth.h" @@ -889,6 +890,26 @@ svn_io_stat_dirent(const svn_io_dirent2_t **dirent_p, scratch_pool)); } +svn_error_t * +svn_io_file_rename(const char *from_path, const char *to_path, + apr_pool_t *pool) +{ + return svn_error_trace(svn_io_file_rename2(from_path, to_path, + FALSE, pool)); +} + +svn_error_t * +svn_io_write_atomic(const char *final_path, + const void *buf, + apr_size_t nbytes, + const char *copy_perms_path, + apr_pool_t *scratch_pool) +{ + return svn_error_trace(svn_io_write_atomic2(final_path, buf, nbytes, + copy_perms_path, TRUE, + scratch_pool)); +} + /*** From constructors.c ***/ svn_log_changed_path_t * svn_log_changed_path_dup(const svn_log_changed_path_t *changed_path, @@ -1058,6 +1079,12 @@ svn_stream_from_aprfile(apr_file_t *file, apr_pool_t *pool) } svn_error_t * +svn_stream_for_stdin(svn_stream_t **in, apr_pool_t *pool) +{ + return svn_error_trace(svn_stream_for_stdin2(in, FALSE, pool)); +} + +svn_error_t * svn_stream_contents_same(svn_boolean_t *same, svn_stream_t *stream1, svn_stream_t *stream2, @@ -1183,6 +1210,16 @@ svn_stream_checksummed(svn_stream_t *stream, return s; } +svn_error_t * +svn_string_from_stream(svn_string_t **result, + svn_stream_t *stream, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + return svn_error_trace(svn_string_from_stream2(result, stream, 0, + result_pool)); +} + /*** From path.c ***/ const char * @@ -1251,7 +1288,7 @@ svn_rangelist_merge(svn_rangelist_t **rangelist, pool, pool)); return svn_error_trace( - svn_rangelist__combine_adjacent_ranges(*rangelist, pool)); + svn_rangelist__canonicalize(*rangelist, pool)); } svn_error_t * @@ -1548,3 +1585,19 @@ svn_cmdline_create_auth_baton(svn_auth_baton_t **ab, cancel_baton, pool)); } + +/*** From base64.c ***/ +svn_stream_t * +svn_base64_encode(svn_stream_t *output, apr_pool_t *pool) +{ + return svn_base64_encode2(output, TRUE, pool); +} + +/*** From string.c ***/ +char * +svn_cstring_join(const apr_array_header_t *strings, + const char *separator, + apr_pool_t *pool) +{ + return svn_cstring_join2(strings, separator, TRUE, pool); +} |