Author: hwright
Date: Thu Sep 22 10:29:46 2011
New Revision: 1174046
URL: http://svn.apache.org/viewvc?rev=1174046&view=rev
Log:
Remove some redudancy in a couple type names.
* subversion/include/svn_delta.h
(svn_delta_fetch_props_cb_func_t): Renamed to...
(svn_delta_fetch_props_func_t): ...this.
(svn_delta_fetch_kind_cb_funct_t): Renamed to...
(svn_delta_fetch_kind_func_t): ...this.
(svn_delta_from_editor, svn_editor_from_delta, svn_editor__insert_shim):
Update references.
* subversion/libsvn_delta/compat.c
(ev2_edit_baton, svn_delta_from_editor, svn_editor_from_delta,
svn_editor__insert_shims): Update references.
Modified:
subversion/trunk/subversion/include/svn_delta.h
subversion/trunk/subversion/libsvn_delta/compat.c
Modified: subversion/trunk/subversion/include/svn_delta.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_delta.h?rev=1174046&r1=1174045&r2=1174046&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_delta.h (original)
+++ subversion/trunk/subversion/include/svn_delta.h Thu Sep 22 10:29:46 2011
@@ -1091,7 +1091,7 @@ svn_delta_default_editor(apr_pool_t *poo
*
* @since New in 1.8.
*/
-typedef svn_error_t *(*svn_delta_fetch_props_cb_func_t)(
+typedef svn_error_t *(*svn_delta_fetch_props_func_t)(
apr_hash_t **props,
void *baton,
const char *path,
@@ -1104,7 +1104,7 @@ typedef svn_error_t *(*svn_delta_fetch_p
*
* @since New in 1.8.
*/
-typedef svn_error_t *(*svn_delta_fetch_kind_cb_func_t)(
+typedef svn_error_t *(*svn_delta_fetch_kind_func_t)(
svn_node_kind_t *kind,
void *baton,
const char *path,
@@ -1125,7 +1125,7 @@ svn_error_t *
svn_delta_from_editor(const svn_delta_editor_t **deditor,
void **dedit_baton,
svn_editor_t *editor,
- svn_delta_fetch_props_cb_func_t fetch_props_func,
+ svn_delta_fetch_props_func_t fetch_props_func,
void *fetch_props_baton,
apr_pool_t *pool);
@@ -1144,7 +1144,7 @@ svn_editor_from_delta(svn_editor_t **edi
void *dedit_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- svn_delta_fetch_kind_cb_func_t fetch_kind_func,
+ svn_delta_fetch_kind_func_t fetch_kind_func,
void *fetch_kind_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
@@ -1166,9 +1166,9 @@ svn_editor__insert_shims(const svn_delta
void **dedit_baton_out,
const svn_delta_editor_t *deditor_in,
void *dedit_baton_in,
- svn_delta_fetch_props_cb_func_t fetch_props_func,
+ svn_delta_fetch_props_func_t fetch_props_func,
void *fetch_props_baton,
- svn_delta_fetch_kind_cb_func_t fetch_kind_func,
+ svn_delta_fetch_kind_func_t fetch_kind_func,
void *fetch_kind_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1174046&r1=1174045&r2=1174046&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Thu Sep 22 10:29:46 2011
@@ -98,7 +98,7 @@ struct ev2_edit_baton
apr_hash_t *paths;
svn_revnum_t target_revision;
apr_pool_t *edit_pool;
- svn_delta_fetch_props_cb_func_t fetch_props_func;
+ svn_delta_fetch_props_func_t fetch_props_func;
void *fetch_props_baton;
};
@@ -486,7 +486,7 @@ svn_error_t *
svn_delta_from_editor(const svn_delta_editor_t **deditor,
void **dedit_baton,
svn_editor_t *editor,
- svn_delta_fetch_props_cb_func_t fetch_props_func,
+ svn_delta_fetch_props_func_t fetch_props_func,
void *fetch_props_baton,
apr_pool_t *pool)
{
@@ -562,7 +562,7 @@ struct editor_baton
const svn_delta_editor_t *deditor;
void *dedit_baton;
- svn_delta_fetch_kind_cb_func_t fetch_kind_func;
+ svn_delta_fetch_kind_func_t fetch_kind_func;
void *fetch_kind_baton;
struct operation root;
@@ -975,7 +975,7 @@ svn_editor_from_delta(svn_editor_t **edi
void *dedit_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
- svn_delta_fetch_kind_cb_func_t fetch_kind_func,
+ svn_delta_fetch_kind_func_t fetch_kind_func,
void *fetch_kind_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -1024,9 +1024,9 @@ svn_editor__insert_shims(const svn_delta
void **dedit_baton_out,
const svn_delta_editor_t *deditor_in,
void *dedit_baton_in,
- svn_delta_fetch_props_cb_func_t fetch_props_func,
+ svn_delta_fetch_props_func_t fetch_props_func,
void *fetch_props_baton,
- svn_delta_fetch_kind_cb_func_t fetch_kind_func,
+ svn_delta_fetch_kind_func_t fetch_kind_func,
void *fetch_kind_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
