You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/10/16 15:20:21 UTC
svn commit: r1632296 - in /subversion/trunk/subversion:
libsvn_subr/gpg_agent.c libsvn_wc/workqueue.c libsvn_wc/workqueue.h
Author: rhuijben
Date: Thu Oct 16 13:20:20 2014
New Revision: 1632296
URL: http://svn.apache.org/r1632296
Log:
Fix pool argument ordering for two functions. In both cases all callers pass
the same value for both pools.
* subversion/libsvn_subr/gpg_agent.c
(get_cache_id): Fix argument ordering.
* subversion/libsvn_wc/workqueue.c
(svn_wc__wq_build_dir_install): Fix argument ordering.
* subversion/libsvn_wc/workqueue.h
(svn_wc__wq_build_dir_install): Fix argument ordering.
Modified:
subversion/trunk/subversion/libsvn_subr/gpg_agent.c
subversion/trunk/subversion/libsvn_wc/workqueue.c
subversion/trunk/subversion/libsvn_wc/workqueue.h
Modified: subversion/trunk/subversion/libsvn_subr/gpg_agent.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/gpg_agent.c?rev=1632296&r1=1632295&r2=1632296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/gpg_agent.c (original)
+++ subversion/trunk/subversion/libsvn_subr/gpg_agent.c Thu Oct 16 13:20:20 2014
@@ -108,7 +108,7 @@ escape_blanks(char *str)
* to other password caching mechanisms. */
static svn_error_t *
get_cache_id(const char **cache_id_p, const char *realmstring,
- apr_pool_t *scratch_pool, apr_pool_t *result_pool)
+ apr_pool_t *result_pool, apr_pool_t *scratch_pool)
{
const char *cache_id = NULL;
svn_checksum_t *digest = NULL;
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1632296&r1=1632295&r2=1632296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Thu Oct 16 13:20:20 2014
@@ -1016,8 +1016,8 @@ svn_error_t *
svn_wc__wq_build_dir_install(svn_skel_t **work_item,
svn_wc__db_t *db,
const char *local_abspath,
- apr_pool_t *scratch_pool,
- apr_pool_t *result_pool)
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
const char *local_relpath;
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.h?rev=1632296&r1=1632295&r2=1632296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.h (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.h Thu Oct 16 13:20:20 2014
@@ -215,8 +215,8 @@ svn_error_t *
svn_wc__wq_build_dir_install(svn_skel_t **work_item,
svn_wc__db_t *db,
const char *local_abspath,
- apr_pool_t *scratch_pool,
- apr_pool_t *result_pool);
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
svn_error_t *
svn_wc__wq_build_postupgrade(svn_skel_t **work_item,