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 2011/04/13 12:36:57 UTC
svn commit: r1091733 - in /subversion/trunk/subversion: include/svn_client.h
libsvn_client/deprecated.c libsvn_client/util.c
Author: rhuijben
Date: Wed Apr 13 10:36:56 2011
New Revision: 1091733
URL: http://svn.apache.org/viewvc?rev=1091733&view=rev
Log:
Add a missing SVN_DEPRECATED and move two functions to deprecated.c
* subversion/include/svn_client.h
(svn_client_commit_item_create): Add SVN_DEPRECATED.
* subversion/libsvn_client/deprecated.c
(svn_client_commit_item_create,
svn_client_commit_item2_dup): Moved here...
* subversion/libsvn_client/util.c
(svn_client_commit_item_create,
svn_client_commit_item2_dup): ... from here.
Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/libsvn_client/deprecated.c
subversion/trunk/subversion/libsvn_client/util.c
Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1091733&r1=1091732&r2=1091733&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Apr 13 10:36:56 2011
@@ -557,7 +557,7 @@ svn_client_commit_item3_create(apr_pool_
*
* @deprecated Provided for backward compatibility with the 1.5 API.
*/
-svn_error_t *
+SVN_DEPRECATED svn_error_t *
svn_client_commit_item_create(const svn_client_commit_item3_t **item,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/libsvn_client/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/deprecated.c?rev=1091733&r1=1091732&r2=1091733&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_client/deprecated.c Wed Apr 13 10:36:56 2011
@@ -2185,3 +2185,36 @@ svn_client_relocate(const char *path,
_("Non-recursive relocation not supported")));
return svn_client_relocate2(path, from_prefix, to_prefix, TRUE, ctx, pool);
}
+
+/*** From util.c ***/
+svn_error_t *
+svn_client_commit_item_create(const svn_client_commit_item3_t **item,
+ apr_pool_t *pool)
+{
+ *item = svn_client_commit_item3_create(pool);
+ return SVN_NO_ERROR;
+}
+
+svn_client_commit_item2_t *
+svn_client_commit_item2_dup(const svn_client_commit_item2_t *item,
+ apr_pool_t *pool)
+{
+ svn_client_commit_item2_t *new_item = apr_palloc(pool, sizeof(*new_item));
+
+ *new_item = *item;
+
+ if (new_item->path)
+ new_item->path = apr_pstrdup(pool, new_item->path);
+
+ if (new_item->url)
+ new_item->url = apr_pstrdup(pool, new_item->url);
+
+ if (new_item->copyfrom_url)
+ new_item->copyfrom_url = apr_pstrdup(pool, new_item->copyfrom_url);
+
+ if (new_item->wcprop_changes)
+ new_item->wcprop_changes = svn_prop_array_dup(new_item->wcprop_changes,
+ pool);
+
+ return new_item;
+}
Modified: subversion/trunk/subversion/libsvn_client/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/util.c?rev=1091733&r1=1091732&r2=1091733&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/util.c (original)
+++ subversion/trunk/subversion/libsvn_client/util.c Wed Apr 13 10:36:56 2011
@@ -67,14 +67,6 @@ svn_client_commit_item3_create(apr_pool_
return apr_pcalloc(pool, sizeof(svn_client_commit_item3_t));
}
-svn_error_t *
-svn_client_commit_item_create(const svn_client_commit_item3_t **item,
- apr_pool_t *pool)
-{
- *item = svn_client_commit_item3_create(pool);
- return SVN_NO_ERROR;
-}
-
svn_client_commit_item3_t *
svn_client_commit_item3_dup(const svn_client_commit_item3_t *item,
apr_pool_t *pool)
@@ -103,30 +95,6 @@ svn_client_commit_item3_dup(const svn_cl
return new_item;
}
-svn_client_commit_item2_t *
-svn_client_commit_item2_dup(const svn_client_commit_item2_t *item,
- apr_pool_t *pool)
-{
- svn_client_commit_item2_t *new_item = apr_palloc(pool, sizeof(*new_item));
-
- *new_item = *item;
-
- if (new_item->path)
- new_item->path = apr_pstrdup(pool, new_item->path);
-
- if (new_item->url)
- new_item->url = apr_pstrdup(pool, new_item->url);
-
- if (new_item->copyfrom_url)
- new_item->copyfrom_url = apr_pstrdup(pool, new_item->copyfrom_url);
-
- if (new_item->wcprop_changes)
- new_item->wcprop_changes = svn_prop_array_dup(new_item->wcprop_changes,
- pool);
-
- return new_item;
-}
-
svn_client_proplist_item_t *
svn_client_proplist_item_dup(const svn_client_proplist_item_t *item,
apr_pool_t * pool)