You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2011/02/04 18:45:02 UTC
svn commit: r1067238 -
/subversion/trunk/subversion/libsvn_client/commit_util.c
Author: cmpilato
Date: Fri Feb 4 17:45:02 2011
New Revision: 1067238
URL: http://svn.apache.org/viewvc?rev=1067238&view=rev
Log:
Miscellaneous cleanups I noticed while working on the previous change.
* subversion/libsvn_client/commit_util.c
(add_lock_token): Code formatting changes only.
(harvest_committables): Avoid unnecessary pool dup of lock token URL.
Modified:
subversion/trunk/subversion/libsvn_client/commit_util.c
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1067238&r1=1067237&r2=1067238&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Fri Feb 4 17:45:02 2011
@@ -206,8 +206,8 @@ add_lock_token(const char *local_abspath
{
struct add_lock_token_baton *altb = walk_baton;
apr_pool_t *token_pool = apr_hash_pool_get(altb->lock_tokens);
- const char* lock_token;
- const char* url;
+ const char *lock_token;
+ const char *url;
/* I want every lock-token I can get my dirty hands on!
If this entry is switched, so what. We will send an irrelevant lock
@@ -746,15 +746,11 @@ harvest_committables(apr_hash_t *committ
state_flags,
result_pool, scratch_pool));
if (state_flags & SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN)
- {
- const char *url = svn_path_url_add_component2(
- repos_root_url,
- repos_relpath, scratch_pool);
-
- apr_hash_set(lock_tokens,
- apr_pstrdup(apr_hash_pool_get(lock_tokens), url),
+ apr_hash_set(lock_tokens,
+ svn_path_url_add_component2(
+ repos_root_url, repos_relpath,
+ apr_hash_pool_get(lock_tokens)),
APR_HASH_KEY_STRING, entry_lock_token);
- }
}
}