Author: philip
Date: Tue Jul  6 16:58:33 2010
New Revision: 960944

URL: http://svn.apache.org/viewvc?rev=960944&view=rev
Log:
Changes to make SINGLE_DB code compile.

* subversion/libsvn_wc/log.c
  (svn_wc_cleanup3): Use correct variable names.

* subversion/libsvn_wc/deprecated.c
  (svn_wc_mark_missing_deleted): Use correct variable names.

Modified:
    subversion/trunk/subversion/libsvn_wc/deprecated.c
    subversion/trunk/subversion/libsvn_wc/log.c

Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=960944&r1=960943&r2=960944&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Tue Jul  6 16:58:33 2010
@@ -2046,7 +2046,7 @@ svn_wc_mark_missing_deleted(const char *
   return svn_error_createf(SVN_ERR_WC_PATH_FOUND, NULL,
                            _("Unexpectedly found '%s': "
                              "path is marked 'missing'"),
-                           svn_dirent_local_style(path, scratch_pool));
+                           svn_dirent_local_style(path, pool));
 #else
   const char *local_abspath;
   svn_wc_context_t *wc_ctx;

Modified: subversion/trunk/subversion/libsvn_wc/log.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/log.c?rev=960944&r1=960943&r2=960944&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/log.c (original)
+++ subversion/trunk/subversion/libsvn_wc/log.c Tue Jul  6 16:58:33 2010
@@ -850,7 +850,8 @@ svn_wc_cleanup3(svn_wc_context_t *wc_ctx
 #ifdef SINGLE_DB
   /* Purge the DAV props at and under LOCAL_ABSPATH. */
   /* ### in single-db mode, we need do this purge at the top-level only. */
-  SVN_ERR(svn_wc__db_base_clear_dav_cache_recursive(db, adm_abspath, 
iterpool));
+  SVN_ERR(svn_wc__db_base_clear_dav_cache_recursive(db, local_abspath,
+                                                    scratch_pool));
 #endif
 
   /* We're done with this DB, so proactively close it.  */


Reply via email to