You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/10/18 15:06:54 UTC
svn commit: r1185634 - in /subversion/trunk/subversion: include/svn_delta.h
include/svn_editor.h libsvn_delta/compat.c libsvn_delta/editor.c
libsvn_wc/update_editor.c
Author: hwright
Date: Tue Oct 18 13:06:54 2011
New Revision: 1185634
URL: http://svn.apache.org/viewvc?rev=1185634&view=rev
Log:
Use svn_kind_t in place of svn_node_kind_t in Ev2, and it's backward compat
code.
* subversion/include/svn_editor.h,
subversion/libsvn_delta/compat.c,
subversion/libsvn_delta/editor.c,
subversion/include/svn_delta.h:
s/svn_node_kind_/svn_kind_/
* subversion/libsvn_wc/update_editor.c
(fetch_kind_func): Update param type and simplify function.
Modified:
subversion/trunk/subversion/include/svn_delta.h
subversion/trunk/subversion/include/svn_editor.h
subversion/trunk/subversion/libsvn_delta/compat.c
subversion/trunk/subversion/libsvn_delta/editor.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_delta.h?rev=1185634&r1=1185633&r2=1185634&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_delta.h (original)
+++ subversion/trunk/subversion/include/svn_delta.h Tue Oct 18 13:06:54 2011
@@ -1105,7 +1105,7 @@ typedef svn_error_t *(*svn_delta_fetch_p
* @since New in 1.8.
*/
typedef svn_error_t *(*svn_delta_fetch_kind_func_t)(
- svn_node_kind_t *kind,
+ svn_kind_t *kind,
void *baton,
const char *path,
apr_pool_t *scratch_pool
Modified: subversion/trunk/subversion/include/svn_editor.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_editor.h?rev=1185634&r1=1185633&r2=1185634&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_editor.h (original)
+++ subversion/trunk/subversion/include/svn_editor.h Tue Oct 18 13:06:54 2011
@@ -411,7 +411,7 @@ typedef svn_error_t *(*svn_editor_cb_add
typedef svn_error_t *(*svn_editor_cb_add_absent_t)(
void *baton,
const char *relpath,
- svn_node_kind_t kind,
+ svn_kind_t kind,
svn_revnum_t replaces_rev,
apr_pool_t *scratch_pool);
@@ -787,7 +787,7 @@ svn_editor_add_symlink(svn_editor_t *edi
svn_error_t *
svn_editor_add_absent(svn_editor_t *editor,
const char *relpath,
- svn_node_kind_t kind,
+ svn_kind_t kind,
svn_revnum_t replaces_rev);
/** Drive @a editor's #svn_editor_cb_set_props_t callback.
Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1185634&r1=1185633&r2=1185634&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Tue Oct 18 13:06:54 2011
@@ -287,7 +287,7 @@ ev2_add_directory(const char *path,
{
struct ev2_dir_baton *pb = parent_baton;
struct ev2_dir_baton *cb = apr_palloc(result_pool, sizeof(*cb));
- svn_node_kind_t *kind;
+ svn_kind_t *kind;
kind = apr_palloc(pb->eb->edit_pool, sizeof(*kind));
*kind = svn_node_dir;
@@ -362,7 +362,7 @@ ev2_add_file(const char *path,
{
struct ev2_file_baton *fb = apr_palloc(result_pool, sizeof(*fb));
struct ev2_dir_baton *pb = parent_baton;
- svn_node_kind_t *kind;
+ svn_kind_t *kind;
fb->eb = pb->eb;
fb->path = apr_pstrdup(result_pool, path);
@@ -547,7 +547,7 @@ struct operation {
occuring; directories are OP_OPEN with non-empty
props */
} operation;
- svn_node_kind_t kind; /* to copy, mkdir, put or set revprops */
+ svn_kind_t kind; /* to copy, mkdir, put or set revprops */
svn_revnum_t rev; /* to copy, valid for add and replace */
const char *url; /* to copy, valid for add and replace */
const char *src_file; /* for put, the source file for contents */
@@ -761,7 +761,7 @@ add_symlink_cb(void *baton,
static svn_error_t *
add_absent_cb(void *baton,
const char *relpath,
- svn_node_kind_t kind,
+ svn_kind_t kind,
svn_revnum_t replaces_rev,
apr_pool_t *scratch_pool)
{
Modified: subversion/trunk/subversion/libsvn_delta/editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/editor.c?rev=1185634&r1=1185633&r2=1185634&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/editor.c (original)
+++ subversion/trunk/subversion/libsvn_delta/editor.c Tue Oct 18 13:06:54 2011
@@ -354,7 +354,7 @@ svn_editor_add_symlink(svn_editor_t *edi
svn_error_t *
svn_editor_add_absent(svn_editor_t *editor,
const char *relpath,
- svn_node_kind_t kind,
+ svn_kind_t kind,
svn_revnum_t replaces_rev)
{
svn_error_t *err;
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1185634&r1=1185633&r2=1185634&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Oct 18 13:06:54 2011
@@ -4755,7 +4755,7 @@ fetch_props_func(apr_hash_t **props,
}
static svn_error_t *
-fetch_kind_func(svn_node_kind_t *kind,
+fetch_kind_func(svn_kind_t *kind,
void *baton,
const char *path,
apr_pool_t *scratch_pool)
@@ -4763,17 +4763,9 @@ fetch_kind_func(svn_node_kind_t *kind,
struct fetch_baton *fpb = baton;
const char *local_abspath = svn_dirent_join(fpb->target_abspath, path,
scratch_pool);
- svn_kind_t db_kind;
- SVN_ERR(svn_wc__db_read_kind(&db_kind, fpb->db, local_abspath, FALSE,
+ SVN_ERR(svn_wc__db_read_kind(kind, fpb->db, local_abspath, FALSE,
scratch_pool));
-
- if (db_kind == svn_kind_dir)
- *kind = svn_node_dir;
- else if (db_kind == svn_kind_file)
- *kind = svn_node_file;
- else
- *kind = svn_node_none;
return SVN_NO_ERROR;
}