You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2017/03/06 19:15:03 UTC
svn commit: r1785737 -
/subversion/trunk/subversion/libsvn_fs_fs/transaction.c
Author: stefan2
Date: Mon Mar 6 19:15:03 2017
New Revision: 1785737
URL: http://svn.apache.org/viewvc?rev=1785737&view=rev
Log:
Minor code cleanup to reduce the size of following patches.
* subversion/libsvn_fs_fs/transaction.c
(get_shared_rep): Construct the SHA1 we are looking for in only one place.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/transaction.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/transaction.c?rev=1785737&r1=1785736&r2=1785737&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/transaction.c Mon Mar 6 19:15:03 2017
@@ -2267,6 +2267,10 @@ get_shared_rep(representation_t **old_re
svn_error_t *err;
fs_fs_data_t *ffd = fs->fsap_data;
+ svn_checksum_t checksum;
+ checksum.digest = rep->sha1_digest;
+ checksum.kind = svn_checksum_sha1;
+
/* Return NULL, if rep sharing has been disabled. */
*old_rep = NULL;
if (!ffd->rep_sharing_allowed)
@@ -2287,9 +2291,6 @@ get_shared_rep(representation_t **old_re
/* If we haven't found anything yet, try harder and consult our DB. */
if (*old_rep == NULL)
{
- svn_checksum_t checksum;
- checksum.digest = rep->sha1_digest;
- checksum.kind = svn_checksum_sha1;
err = svn_fs_fs__get_rep_reference(old_rep, fs, &checksum, result_pool);
/* ### Other error codes that we shouldn't mask out? */
if (err == SVN_NO_ERROR)
@@ -2355,10 +2356,6 @@ get_shared_rep(representation_t **old_re
Because not sharing reps is always a safe option,
terminating the request would be inappropriate.
*/
- svn_checksum_t checksum;
- checksum.digest = rep->sha1_digest;
- checksum.kind = svn_checksum_sha1;
-
err = svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
"Rep size %s mismatches rep-cache.db value %s "
"for SHA1 %s.\n"