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 2015/05/13 07:04:34 UTC
svn commit: r1679142 - in /subversion/branches/1.10-cache-improvements: ./
subversion/libsvn_subr/cache-membuffer.c
Author: stefan2
Date: Wed May 13 05:04:34 2015
New Revision: 1679142
URL: http://svn.apache.org/r1679142
Log:
On the 1.10-cache-improvements branch:
Merge r1678990 and r1679000 (code cleanup) from 1.9-cache-improvements
branch with no conflicts.
Modified:
subversion/branches/1.10-cache-improvements/ (props changed)
subversion/branches/1.10-cache-improvements/subversion/libsvn_subr/cache-membuffer.c
Propchange: subversion/branches/1.10-cache-improvements/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 05:04:34 2015
@@ -1,5 +1,6 @@
/subversion/branches/1.5.x-r30215:870312
/subversion/branches/1.7.x-fs-verify:1146708,1161180
+/subversion/branches/1.9-cache-improvements:1678990,1679000
/subversion/branches/10Gb:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
/subversion/branches/atomic-revprop:965046-1000689
/subversion/branches/authzperf:1615360
Modified: subversion/branches/1.10-cache-improvements/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10-cache-improvements/subversion/libsvn_subr/cache-membuffer.c?rev=1679142&r1=1679141&r2=1679142&view=diff
==============================================================================
--- subversion/branches/1.10-cache-improvements/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/branches/1.10-cache-improvements/subversion/libsvn_subr/cache-membuffer.c Wed May 13 05:04:34 2015
@@ -469,7 +469,7 @@ static svn_error_t *store_key_part(entry
/* Initialize the content hash member of TAG.
*/
static svn_error_t* store_content_part(entry_tag_t *tag,
- const char *data,
+ const void *data,
apr_size_t size,
apr_pool_t *pool)
{
@@ -2388,9 +2388,7 @@ membuffer_cache_get_internal(svn_membuff
size = ALIGN_VALUE(entry->size) - entry->key.key_len;
*buffer = ALIGN_POINTER(apr_palloc(result_pool, size + ITEM_ALIGNMENT-1));
- memcpy(*buffer,
- (const char*)cache->data + entry->offset + entry->key.key_len,
- size);
+ memcpy(*buffer, cache->data + entry->offset + entry->key.key_len, size);
#ifdef SVN_DEBUG_CACHE_MEMBUFFER
@@ -2542,8 +2540,7 @@ membuffer_cache_get_partial_internal(svn
}
else
{
- const char *item_data = (const char*)cache->data + entry->offset
- + entry->key.key_len;
+ const void *item_data = cache->data + entry->offset + entry->key.key_len;
apr_size_t item_size = entry->size - entry->key.key_len;
*found = TRUE;
increment_hit_counters(cache, entry);
@@ -2626,8 +2623,8 @@ membuffer_cache_set_partial_internal(svn
/* access the serialized cache item */
apr_size_t key_len = entry->key.key_len;
- char *item_data = (char*)cache->data + entry->offset + key_len;
- char *orig_data = item_data;
+ void *item_data = cache->data + entry->offset + key_len;
+ void *orig_data = item_data;
apr_size_t item_size = entry->size - key_len;
increment_hit_counters(cache, entry);
@@ -2650,7 +2647,7 @@ membuffer_cache_set_partial_internal(svn
/* modify it, preferably in-situ.
*/
- err = func((void **)&item_data, &item_size, baton, scratch_pool);
+ err = func(&item_data, &item_size, baton, scratch_pool);
if (err)
{