svn commit: r1067697 - /subversion/branches/performance/subversion/libsvn_fs_util/caching.c

[st...@apache.org]

Author: stefan2
Date: Sun Feb  6 16:35:11 2011
New Revision: 1067697

URL: http://svn.apache.org/viewvc?rev=1067697&view=rev
Log:
Fix merge / manual conflict resolution artifacts.

* subversion/libsvn_fs_util/caching.c
  (svn_fs__get_global_membuffer_cache): manually sync with /trunk

Modified:
    subversion/branches/performance/subversion/libsvn_fs_util/caching.c

Modified: subversion/branches/performance/subversion/libsvn_fs_util/caching.c
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/libsvn_fs_util/caching.c?rev=1067697&r1=1067696&r2=1067697&view=diff
==============================================================================
--- subversion/branches/performance/subversion/libsvn_fs_util/caching.c (original)
+++ subversion/branches/performance/subversion/libsvn_fs_util/caching.c Sun Feb  6 16:35:11 2011
@@ -86,12 +86,12 @@ svn_fs__get_global_membuffer_cache(void)
       apr_allocator_max_free_set(allocator, 1);
       pool = svn_pool_create_ex(NULL, allocator);
 
-      svn_cache__membuffer_cache_create
-          (&new_cache,
-           (apr_size_t)cache_size,
-           (apr_size_t)cache_size / 16,
-           ! svn_fs_get_cache_config()->single_threaded,
-           pool);
+      svn_error_clear(svn_cache__membuffer_cache_create(
+          &new_cache,
+          (apr_size_t)cache_size,
+          (apr_size_t)(cache_size / 16),
+          ! svn_fs_get_cache_config()->single_threaded,
+          pool));
 
       /* Handle race condition: if we are the first to create a
        * cache object, make it our global singleton. Otherwise,
@@ -142,7 +142,7 @@ svn_fs__get_global_file_handle_cache(voi
   return cache;
 }
 
-void 
+void
 svn_fs_set_cache_config(const svn_fs_cache_config_t *settings)
 {
   cache_settings = *settings;