You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/05/23 20:51:36 UTC
svn commit: r947466 - in /subversion/trunk/subversion: include/svn_client.h
tests/libsvn_client/client-test.c
Author: stsp
Date: Sun May 23 18:51:36 2010
New Revision: 947466
URL: http://svn.apache.org/viewvc?rev=947466&view=rev
Log:
Follow-up to r947457:
* subversion/include/svn_client.h
(svn_client_patch_func_t): Rename the LOCAL_ABSPATH parameter to
CANON_PATH_FROM_PATCHFILE, as already done in the docstring in r947457.
* subversion/tests/libsvn_client/client-test.c
(patch_collection_func): Do the same here for consistency.
Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/tests/libsvn_client/client-test.c
Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=947466&r1=947465&r2=947466&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Sun May 23 18:51:36 2010
@@ -4863,7 +4863,7 @@ svn_client_info(const char *path_or_url,
typedef svn_error_t *(*svn_client_patch_func_t)(
void *baton,
svn_boolean_t *filtered,
- const char *local_abspath,
+ const char *canon_path_from_patchfile,
const char *patch_abspath,
const char *reject_abspath,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/tests/libsvn_client/client-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/client-test.c?rev=947466&r1=947465&r2=947466&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/client-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/client-test.c Sun May 23 18:51:36 2010
@@ -258,7 +258,7 @@ struct patch_collection_baton
static svn_error_t *
patch_collection_func(void *baton,
svn_boolean_t *filtered,
- const char *local_abspath,
+ const char *canon_path_from_patchfile,
const char *patch_abspath,
const char *reject_abspath,
apr_pool_t *scratch_pool)
@@ -267,13 +267,13 @@ patch_collection_func(void *baton,
if (patch_abspath)
apr_hash_set(pcb->patched_tempfiles,
- apr_pstrdup(pcb->state_pool, local_abspath),
+ apr_pstrdup(pcb->state_pool, canon_path_from_patchfile),
APR_HASH_KEY_STRING,
apr_pstrdup(pcb->state_pool, patch_abspath));
if (reject_abspath)
apr_hash_set(pcb->reject_tempfiles,
- apr_pstrdup(pcb->state_pool, local_abspath),
+ apr_pstrdup(pcb->state_pool, canon_path_from_patchfile),
APR_HASH_KEY_STRING,
apr_pstrdup(pcb->state_pool, reject_abspath));