deprecated.c revision 299742
162587Sitojun/* 295023Ssuz * deprecated.c : Public, deprecated wrappers to our private ra_svn API 362587Sitojun * 4139823Simp * ==================================================================== 554263Sshin * Licensed to the Apache Software Foundation (ASF) under one 654263Sshin * or more contributor license agreements. See the NOTICE file 754263Sshin * distributed with this work for additional information 854263Sshin * regarding copyright ownership. The ASF licenses this file 954263Sshin * to you under the Apache License, Version 2.0 (the 1054263Sshin * "License"); you may not use this file except in compliance 1154263Sshin * with the License. You may obtain a copy of the License at 1254263Sshin * 1354263Sshin * http://www.apache.org/licenses/LICENSE-2.0 1454263Sshin * 1554263Sshin * Unless required by applicable law or agreed to in writing, 1654263Sshin * software distributed under the License is distributed on an 1754263Sshin * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 1854263Sshin * KIND, either express or implied. See the License for the 1954263Sshin * specific language governing permissions and limitations 2054263Sshin * under the License. 2154263Sshin * ==================================================================== 2254263Sshin */ 2354263Sshin 2454263Sshin/* We define this here to remove any further warnings about the usage of 2554263Sshin deprecated functions in this file. */ 2654263Sshin#define SVN_DEPRECATED 2754263Sshin 2854263Sshin#include "svn_ra_svn.h" 2954263Sshin 3054263Sshin#include "private/svn_ra_svn_private.h" 3154263Sshin 3254263Sshinsvn_error_t * 3354263Sshinsvn_ra_svn_write_number(svn_ra_svn_conn_t *conn, 3454263Sshin apr_pool_t *pool, 35101739Srwatson apr_uint64_t number) 3654263Sshin{ 3754263Sshin return svn_error_trace(svn_ra_svn__write_number(conn, pool, number)); 3854263Sshin} 3954263Sshin 40101182Srwatsonsvn_error_t * 4154263Sshinsvn_ra_svn_write_string(svn_ra_svn_conn_t *conn, 4254263Sshin apr_pool_t *pool, 43129880Sphk const svn_string_t *str) 4454263Sshin{ 4554263Sshin return svn_error_trace(svn_ra_svn__write_string(conn, pool, str)); 4654263Sshin} 4754263Sshin 4891270Sbrookssvn_error_t * 4954263Sshinsvn_ra_svn_write_cstring(svn_ra_svn_conn_t *conn, 5062587Sitojun apr_pool_t *pool, 5179106Sbrooks const char *s) 5254263Sshin{ 5354263Sshin return svn_error_trace(svn_ra_svn__write_cstring(conn, pool, s)); 5454263Sshin} 55130933Sbrooks 5654263Sshinsvn_error_t * 5754263Sshinsvn_ra_svn_write_word(svn_ra_svn_conn_t *conn, 5854263Sshin apr_pool_t *pool, 5954263Sshin const char *word) 6054263Sshin{ 6154263Sshin return svn_error_trace(svn_ra_svn__write_word(conn, pool, word)); 6254263Sshin} 6378064Sume 6478064Sumesvn_error_t * 6554263Sshinsvn_ra_svn_write_proplist(svn_ra_svn_conn_t *conn, 6654263Sshin apr_pool_t *pool, 6779106Sbrooks apr_hash_t *props) 6854263Sshin{ 6954263Sshin return svn_error_trace(svn_ra_svn__write_proplist(conn, pool, props)); 7054263Sshin} 7154263Sshin 7254263Sshinsvn_error_t * 7354263Sshinsvn_ra_svn_start_list(svn_ra_svn_conn_t *conn, 7454263Sshin apr_pool_t *pool) 7554263Sshin{ 7654263Sshin return svn_error_trace(svn_ra_svn__start_list(conn, pool)); 7754263Sshin} 7862587Sitojun 7954263Sshinsvn_error_t * 8054263Sshinsvn_ra_svn_end_list(svn_ra_svn_conn_t *conn, 8162587Sitojun apr_pool_t *pool) 8254263Sshin{ 8354263Sshin return svn_error_trace(svn_ra_svn__end_list(conn, pool)); 8454263Sshin} 8554263Sshin 8679106Sbrookssvn_error_t * 8762587Sitojunsvn_ra_svn_flush(svn_ra_svn_conn_t *conn, 88127305Srwatson apr_pool_t *pool) 89127898Sru{ 90127305Srwatson return svn_error_trace(svn_ra_svn__flush(conn, pool)); 91127305Srwatson} 92127305Srwatson 9379106Sbrookssvn_error_t * 9489065Smsmithsvn_ra_svn_write_tuple(svn_ra_svn_conn_t *conn, 9579106Sbrooks apr_pool_t *pool, 9683998Sbrooks const char *fmt, ...) 9783998Sbrooks{ 9883998Sbrooks va_list va; 9983998Sbrooks svn_error_t *err; 10083998Sbrooks 101128209Sbrooks va_start(va, fmt); 102128209Sbrooks err = svn_ra_svn__write_tuple(conn, pool, fmt, va); 10379106Sbrooks va_end(va); 104130933Sbrooks 10579106Sbrooks return svn_error_trace(err); 10692725Salfred} 10779106Sbrooks 10891270Sbrookssvn_error_t * 10991270Sbrookssvn_ra_svn_read_item(svn_ra_svn_conn_t *conn, 11091270Sbrooks apr_pool_t *pool, 11162587Sitojun svn_ra_svn_item_t **item) 11262587Sitojun{ 11391270Sbrooks return svn_error_trace(svn_ra_svn__read_item(conn, pool, item)); 11462587Sitojun} 11562587Sitojun 11662587Sitojunsvn_error_t * 11795023Ssuzsvn_ra_svn_skip_leading_garbage(svn_ra_svn_conn_t *conn, 11862587Sitojun apr_pool_t *pool) 11962587Sitojun{ 12062587Sitojun return svn_error_trace(svn_ra_svn__skip_leading_garbage(conn, pool)); 12162587Sitojun} 12262587Sitojun 12391270Sbrookssvn_error_t * 12491270Sbrookssvn_ra_svn_parse_tuple(const apr_array_header_t *list, 12562587Sitojun apr_pool_t *pool, 12691270Sbrooks const char *fmt, ...) 12791270Sbrooks{ 12891270Sbrooks va_list va; 12991270Sbrooks svn_error_t *err; 13091270Sbrooks 13191270Sbrooks va_start(va, fmt); 13291270Sbrooks err = svn_ra_svn__parse_tuple(list, pool, fmt, va); 13391270Sbrooks va_end(va); 13491270Sbrooks 13591270Sbrooks return svn_error_trace(err); 13691270Sbrooks} 13791270Sbrooks 13891270Sbrookssvn_error_t * 139128209Sbrookssvn_ra_svn_read_tuple(svn_ra_svn_conn_t *conn, 14079106Sbrooks apr_pool_t *pool, 14179106Sbrooks const char *fmt, ...) 14292081Smux{ 14354263Sshin va_list va; 14478064Sume svn_error_t *err; 14554263Sshin 146131672Sbms va_start(va, fmt); 14779106Sbrooks err = svn_ra_svn__read_tuple(conn, pool, fmt, va); 14879106Sbrooks va_end(va); 149121816Sbrooks 15079106Sbrooks return svn_error_trace(err); 151105293Sume} 152105293Sume 153127305Srwatsonsvn_error_t * 154105293Sumesvn_ra_svn_parse_proplist(const apr_array_header_t *list, 155127305Srwatson apr_pool_t *pool, 156105293Sume apr_hash_t **props) 157105293Sume{ 158105293Sume return svn_error_trace(svn_ra_svn__parse_proplist(list, pool, props)); 159105293Sume} 160105293Sume 161105293Sumesvn_error_t * 162105293Sumesvn_ra_svn_read_cmd_response(svn_ra_svn_conn_t *conn, 163105293Sume apr_pool_t *pool, 16479106Sbrooks const char *fmt, ...) 16562587Sitojun{ 166105293Sume va_list va; 16779106Sbrooks svn_error_t *err; 16879106Sbrooks 16978064Sume va_start(va, fmt); 17079106Sbrooks err = svn_ra_svn__read_cmd_response(conn, pool, fmt, va); 17179106Sbrooks va_end(va); 17278064Sume 17379106Sbrooks return svn_error_trace(err); 17479106Sbrooks} 17579106Sbrooks 17679106Sbrookssvn_error_t * 17779106Sbrookssvn_ra_svn_handle_commands2(svn_ra_svn_conn_t *conn, 17879106Sbrooks apr_pool_t *pool, 17983998Sbrooks const svn_ra_svn_cmd_entry_t *commands, 18083998Sbrooks void *baton, 18179106Sbrooks svn_boolean_t error_on_disconnect) 18279106Sbrooks{ 183127305Srwatson return svn_error_trace(svn_ra_svn__handle_commands2(conn, pool, 184127305Srwatson commands, baton, 18579106Sbrooks error_on_disconnect)); 186127305Srwatson} 18779106Sbrooks 18879106Sbrookssvn_error_t * 189127305Srwatsonsvn_ra_svn_handle_commands(svn_ra_svn_conn_t *conn, 190105293Sume apr_pool_t *pool, 191105293Sume const svn_ra_svn_cmd_entry_t *commands, 192105293Sume void *baton) 193105293Sume{ 194105293Sume return svn_error_trace(svn_ra_svn__handle_commands2(conn, pool, 195105293Sume commands, baton, 196105293Sume FALSE)); 19779106Sbrooks} 19879106Sbrooks 19979106Sbrookssvn_error_t * 20079106Sbrookssvn_ra_svn_write_cmd(svn_ra_svn_conn_t *conn, 201105293Sume apr_pool_t *pool, 20279106Sbrooks const char *cmdname, 20383998Sbrooks const char *fmt, ...) 20483998Sbrooks{ 20579106Sbrooks va_list va; 20679106Sbrooks svn_error_t *err; 20779106Sbrooks 20879106Sbrooks SVN_ERR(svn_ra_svn__start_list(conn, pool)); 20979106Sbrooks SVN_ERR(svn_ra_svn__write_word(conn, pool, cmdname)); 21079106Sbrooks va_start(va, fmt); 211128209Sbrooks err = svn_ra_svn__write_tuple(conn, pool, fmt, va); 212127305Srwatson va_end(va); 213127305Srwatson return err ? svn_error_trace(err) : svn_ra_svn__end_list(conn, pool); 214127305Srwatson} 215127305Srwatson 216127305Srwatsonsvn_error_t * 217127305Srwatsonsvn_ra_svn_write_cmd_response(svn_ra_svn_conn_t *conn, 218127305Srwatson apr_pool_t *pool, 219127305Srwatson const char *fmt, ...) 220127305Srwatson{ 221127305Srwatson va_list va; 222127305Srwatson svn_error_t *err; 22379106Sbrooks 22479106Sbrooks va_start(va, fmt); 22579106Sbrooks err = svn_ra_svn__write_cmd_response(conn, pool, fmt, va); 22679106Sbrooks va_end(va); 22779106Sbrooks 22879106Sbrooks return svn_error_trace(err); 229127305Srwatson} 23079106Sbrooks 23179106Sbrooks 23279106Sbrookssvn_error_t * 233127305Srwatsonsvn_ra_svn_write_cmd_failure(svn_ra_svn_conn_t *conn, 23483997Sbrooks apr_pool_t *pool, 23579106Sbrooks svn_error_t *err) 23679106Sbrooks{ 23779106Sbrooks return svn_error_trace(svn_ra_svn__write_cmd_failure(conn, pool, err)); 23879106Sbrooks} 23962587Sitojun 24079106Sbrooks/* From marshal.c */ 24179106Sbrookssvn_ra_svn_conn_t * 24279106Sbrookssvn_ra_svn_create_conn3(apr_socket_t *sock, 24379106Sbrooks apr_file_t *in_file, 24479106Sbrooks apr_file_t *out_file, 245127305Srwatson int compression_level, 246127305Srwatson apr_size_t zero_copy_limit, 247127305Srwatson apr_size_t error_check_interval, 248127305Srwatson apr_pool_t *pool) 249127305Srwatson{ 250127305Srwatson svn_stream_t *in_stream = NULL; 251127305Srwatson svn_stream_t *out_stream = NULL; 252127305Srwatson 253127305Srwatson if (in_file) 25479106Sbrooks in_stream = svn_stream_from_aprfile2(in_file, FALSE, pool); 25579106Sbrooks if (out_file) 25662587Sitojun out_stream = svn_stream_from_aprfile2(out_file, FALSE, pool); 25779106Sbrooks 258132199Sphk return svn_ra_svn_create_conn4(sock, in_stream, out_stream, 259132199Sphk compression_level, zero_copy_limit, 26054263Sshin error_check_interval, pool); 26179106Sbrooks} 26254263Sshin 26354263Sshinsvn_ra_svn_conn_t * 26479106Sbrookssvn_ra_svn_create_conn2(apr_socket_t *sock, 26579106Sbrooks apr_file_t *in_file, 26679106Sbrooks apr_file_t *out_file, 26779106Sbrooks int compression_level, 26879106Sbrooks apr_pool_t *pool) 26954263Sshin{ 27079106Sbrooks return svn_ra_svn_create_conn3(sock, in_file, out_file, 27183997Sbrooks compression_level, 0, 0, pool); 27279106Sbrooks} 273105293Sume 27462587Sitojun/* backward-compatible implementation using the default compression level */ 27562587Sitojunsvn_ra_svn_conn_t * 27662587Sitojunsvn_ra_svn_create_conn(apr_socket_t *sock, 27762587Sitojun apr_file_t *in_file, 27862587Sitojun apr_file_t *out_file, 27962587Sitojun apr_pool_t *pool) 28062587Sitojun{ 28162587Sitojun return svn_ra_svn_create_conn3(sock, in_file, out_file, 28262587Sitojun SVN_DELTA_COMPRESSION_LEVEL_DEFAULT, 0, 0, 28362587Sitojun pool); 28462587Sitojun} 28562587Sitojun