Author: rhuijben
Date: Fri Jun 10 12:53:53 2011
New Revision: 1134296
URL: http://svn.apache.org/viewvc?rev=1134296&view=rev
Log:
Don't use svn_dirent_join_many() when there are just two path components.
* subversion/libsvn_client/mergeinfo.c
(elide_mergeinfo): Calculate path once and use a normal join.
* subversion/libsvn_subr/config_file.c
(ensure_auth_subdir): Use simple joins when possible.
Modified:
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/libsvn_subr/config_file.c
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1134296&r1=1134295&r2=1134296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Fri Jun 10 12:53:53
2011
@@ -861,18 +861,14 @@ elide_mergeinfo(svn_mergeinfo_t parent_m
if (ctx->notify_func2)
{
+ const char *path = svn_dirent_join(local_abspath, path_suffix,
+ scratch_pool);
svn_wc_notify_t *notify =
- svn_wc_create_notify(
- svn_dirent_join_many(scratch_pool, local_abspath,
- path_suffix, NULL),
- svn_wc_notify_merge_elide_info, scratch_pool);
+ svn_wc_create_notify(path, svn_wc_notify_merge_elide_info,
+ scratch_pool);
ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool);
- notify = svn_wc_create_notify(svn_dirent_join_many(scratch_pool,
- local_abspath,
- path_suffix,
- NULL),
- svn_wc_notify_update_update,
+ notify = svn_wc_create_notify(path, svn_wc_notify_update_update,
scratch_pool);
notify->prop_state = svn_wc_notify_state_changed;
ctx->notify_func2(ctx->notify_baton2, notify, scratch_pool);
Modified: subversion/trunk/subversion/libsvn_subr/config_file.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config_file.c?rev=1134296&r1=1134295&r2=1134296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/config_file.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config_file.c Fri Jun 10 12:53:53
2011
@@ -463,7 +463,7 @@ ensure_auth_subdir(const char *auth_dir,
const char *subdir_full_path;
svn_node_kind_t kind;
- subdir_full_path = svn_dirent_join_many(pool, auth_dir, subdir, NULL);
+ subdir_full_path = svn_dirent_join(auth_dir, subdir, pool);
err = svn_io_check_path(subdir_full_path, &kind, pool);
if (err || kind == svn_node_none)
{
@@ -485,7 +485,7 @@ ensure_auth_dirs(const char *path,
svn_error_t *err;
/* Ensure ~/.subversion/auth/ */
- auth_dir = svn_dirent_join_many(pool, path, SVN_CONFIG__AUTH_SUBDIR, NULL);
+ auth_dir = svn_dirent_join(path, SVN_CONFIG__AUTH_SUBDIR, pool);
err = svn_io_check_path(auth_dir, &kind, pool);
if (err || kind == svn_node_none)
{
