You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/05/12 17:05:54 UTC
svn commit: r1678969 - in /subversion/branches/1.9-cache-improvements: ./
subversion/libsvn_subr/cache-membuffer.c
Author: ivan
Date: Tue May 12 15:05:54 2015
New Revision: 1678969
URL: http://svn.apache.org/r1678969
Log:
On the '1.9-cache-improvements' branch: catch up to trunk@1678968.
Modified:
subversion/branches/1.9-cache-improvements/ (props changed)
subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c
Propchange: subversion/branches/1.9-cache-improvements/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 12 15:05:54 2015
@@ -89,3 +89,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
+/subversion/trunk:1678948-1678968
Modified: subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c?rev=1678969&r1=1678968&r2=1678969&view=diff
==============================================================================
--- subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c Tue May 12 15:05:54 2015
@@ -2658,17 +2658,7 @@ combine_key(svn_membuffer_cache_t *cache
apr_uint64_t data[2];
/* short, fixed-size keys are the most common case */
- if (key_len == 16)
- {
- data[0] = ((const apr_uint64_t *)key)[0];
- data[1] = ((const apr_uint64_t *)key)[1];
- }
- else if (key_len == 8)
- {
- data[0] = ((const apr_uint64_t *)key)[0];
- data[1] = 0;
- }
- else if (key_len != APR_HASH_KEY_STRING && key_len < 16)
+ if (key_len != APR_HASH_KEY_STRING && key_len <= 16)
{
data[0] = 0;
data[1] = 0;