You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/10/20 14:39:07 UTC

svn commit: r1533879 - in /subversion/trunk/subversion/libsvn_ra_svn: deprecated.c marshal.c

Author: rhuijben
Date: Sun Oct 20 12:39:06 2013
New Revision: 1533879

URL: http://svn.apache.org/r1533879
Log:
Move two functions to deprecated.c no functional changes.

* subversion/libsvn_ra_svn/deprecated.c
  (svn_ra_svn_create_conn2,
   svn_ra_svn_create_conn): Move deprecated functions here...

* subversion/libsvn_ra_svn/marshal.c
  (svn_ra_svn_create_conn2,
   svn_ra_svn_create_conn): ... that used to be here.

Modified:
    subversion/trunk/subversion/libsvn_ra_svn/deprecated.c
    subversion/trunk/subversion/libsvn_ra_svn/marshal.c

Modified: subversion/trunk/subversion/libsvn_ra_svn/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/deprecated.c?rev=1533879&r1=1533878&r2=1533879&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/deprecated.c Sun Oct 20 12:39:06 2013
@@ -232,3 +232,27 @@ svn_ra_svn_write_cmd_failure(svn_ra_svn_
 {
   return svn_error_trace(svn_ra_svn__write_cmd_failure(conn, pool, err));
 }
+
+/* From marshal.c */
+svn_ra_svn_conn_t *
+svn_ra_svn_create_conn2(apr_socket_t *sock,
+                        apr_file_t *in_file,
+                        apr_file_t *out_file,
+                        int compression_level,
+                        apr_pool_t *pool)
+{
+  return svn_ra_svn_create_conn3(sock, in_file, out_file,
+                                 compression_level, 0, 0, pool);
+}
+
+/* backward-compatible implementation using the default compression level */
+svn_ra_svn_conn_t *
+svn_ra_svn_create_conn(apr_socket_t *sock,
+                       apr_file_t *in_file,
+                       apr_file_t *out_file,
+                       apr_pool_t *pool)
+{
+  return svn_ra_svn_create_conn3(sock, in_file, out_file,
+                                 SVN_DELTA_COMPRESSION_LEVEL_DEFAULT, 0, 0,
+                                 pool);
+}

Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1533879&r1=1533878&r2=1533879&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Sun Oct 20 12:39:06 2013
@@ -139,27 +139,6 @@ svn_ra_svn_conn_t *svn_ra_svn_create_con
   return conn;
 }
 
-svn_ra_svn_conn_t *svn_ra_svn_create_conn2(apr_socket_t *sock,
-                                           apr_file_t *in_file,
-                                           apr_file_t *out_file,
-                                           int compression_level,
-                                           apr_pool_t *pool)
-{
-  return svn_ra_svn_create_conn3(sock, in_file, out_file,
-                                 compression_level, 0, 0, pool);
-}
-
-/* backward-compatible implementation using the default compression level */
-svn_ra_svn_conn_t *svn_ra_svn_create_conn(apr_socket_t *sock,
-                                          apr_file_t *in_file,
-                                          apr_file_t *out_file,
-                                          apr_pool_t *pool)
-{
-  return svn_ra_svn_create_conn3(sock, in_file, out_file,
-                                 SVN_DELTA_COMPRESSION_LEVEL_DEFAULT, 0, 0,
-                                 pool);
-}
-
 svn_error_t *svn_ra_svn_set_capabilities(svn_ra_svn_conn_t *conn,
                                          const apr_array_header_t *list)
 {