subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1030759 - /subversion/branches/performance/subversion/libsvn_fs_fs/fs_fs.c
Date Wed, 03 Nov 2010 23:36:51 GMT
Author: stefan2
Date: Wed Nov  3 23:36:50 2010
New Revision: 1030759

URL: http://svn.apache.org/viewvc?rev=1030759&view=rev
Log:
Fix yet another mistake in tristate usage.

* subversion/libsvn_fs_fs/fs_fs.c:
  (svn_fs_fs__rev_get_root): convert boolean to tristate before 
  comparing it with another tristate

Modified:
    subversion/branches/performance/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/branches/performance/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/libsvn_fs_fs/fs_fs.c?rev=1030759&r1=1030758&r2=1030759&view=diff
==============================================================================
--- subversion/branches/performance/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/performance/subversion/libsvn_fs_fs/fs_fs.c Wed Nov  3 23:36:50 2010
@@ -2968,16 +2968,16 @@ svn_fs_fs__rev_get_root(svn_fs_id_t **ro
   apr_off_t root_offset;
   svn_fs_id_t *root_id = NULL;
   svn_boolean_t is_cached;
+  svn_tristate_t is_packed;
 
   SVN_ERR(ensure_revision_exists(fs, rev, pool));
 
   SVN_ERR(svn_cache__get((void **) root_id_p, &is_cached,
                          ffd->rev_root_id_cache, &rev, pool));
-#if 0
-  if (is_cached &&
-      is_packed_rev(fs, rev) == svn_fs_fs__is_packed(*root_id_p))
+
+  is_packed = is_packed_rev(fs, rev) ? svn_tristate_true : svn_tristate_false;
+  if (is_cached && is_packed == svn_fs_fs__is_packed(*root_id_p))
     return SVN_NO_ERROR;
-#endif
 
   /* we don't care about the file pointer position */
   SVN_ERR(open_pack_or_rev_file(&revision_file, fs, rev, -1,



Mime
View raw message