You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by vm...@apache.org on 2012/12/27 03:27:40 UTC
svn commit: r1426103 - in /subversion/branches/javahl-ra: ./
subversion/libsvn_client/ subversion/libsvn_delta/ subversion/libsvn_fs_fs/
subversion/libsvn_repos/ subversion/libsvn_subr/ subversion/svn/
subversion/tests/libsvn_subr/
Author: vmpn
Date: Thu Dec 27 02:27:39 2012
New Revision: 1426103
URL: http://svn.apache.org/viewvc?rev=1426103&view=rev
Log:
On the javahl-ra branch:
Bring up-to-date with trunk@1405538
Modified:
subversion/branches/javahl-ra/ (props changed)
subversion/branches/javahl-ra/subversion/libsvn_client/patch.c
subversion/branches/javahl-ra/subversion/libsvn_delta/text_delta.c
subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/javahl-ra/subversion/libsvn_repos/load.c
subversion/branches/javahl-ra/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/javahl-ra/subversion/libsvn_subr/spillbuf.c
subversion/branches/javahl-ra/subversion/svn/mergeinfo-cmd.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/io-test.c
Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1405530-1405538
Modified: subversion/branches/javahl-ra/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_client/patch.c?rev=1426103&r1=1426102&r2=1426103&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_client/patch.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_client/patch.c Thu Dec 27 02:27:39 2012
@@ -542,7 +542,7 @@ readline_prop(void *baton, svn_stringbuf
str = svn_stringbuf_create_ensure(80, result_pool);
- if (b->offset >= b->value->len)
+ if ((apr_uint64_t)b->offset >= (apr_uint64_t)b->value->len)
{
*eol_str = NULL;
*eof = TRUE;
Modified: subversion/branches/javahl-ra/subversion/libsvn_delta/text_delta.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_delta/text_delta.c?rev=1426103&r1=1426102&r2=1426103&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_delta/text_delta.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_delta/text_delta.c Thu Dec 27 02:27:39 2012
@@ -801,7 +801,8 @@ apply_window(svn_txdelta_window_t *windo
/* If the existing view overlaps with the new view, copy the
* overlap to the beginning of the new buffer. */
- if (ab->sbuf_offset + ab->sbuf_len > window->sview_offset)
+ if ( (apr_size_t)ab->sbuf_offset + ab->sbuf_len
+ > (apr_size_t)window->sview_offset)
{
apr_size_t start =
(apr_size_t)(window->sview_offset - ab->sbuf_offset);
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs_fs.c?rev=1426103&r1=1426102&r2=1426103&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs_fs.c Thu Dec 27 02:27:39 2012
@@ -3667,7 +3667,7 @@ parse_packed_revprops(svn_fs_t *fs,
/* read & check the serialized size */
SVN_ERR(read_number_from_stream(&size, NULL, stream, iterpool));
- if (size + offset > revprops->packed_revprops->len)
+ if (size + offset > (apr_int64_t)revprops->packed_revprops->len)
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
_("Packed revprop size exceeds pack file size"));
@@ -4970,7 +4970,6 @@ get_contents(struct rep_read_baton *rb,
apr_size_t *len)
{
apr_size_t copy_len, remaining = *len;
- apr_off_t offset;
char *cur = buf;
struct rep_state *rs;
@@ -4986,10 +4985,10 @@ get_contents(struct rep_read_baton *rb,
/* We got the desired rep directly from the cache.
This is where we need the pseudo rep_state created
by build_rep_list(). */
- offset = rs->off - rs->start;
+ apr_size_t offset = (apr_size_t)(rs->off - rs->start);
if (copy_len + offset > rb->base_window->len)
copy_len = offset < rb->base_window->len
- ? (apr_size_t)(rb->base_window->len - offset)
+ ? rb->base_window->len - offset
: 0ul;
memcpy (cur, rb->base_window->data + offset, copy_len);
Modified: subversion/branches/javahl-ra/subversion/libsvn_repos/load.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_repos/load.c?rev=1426103&r1=1426102&r2=1426103&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_repos/load.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_repos/load.c Thu Dec 27 02:27:39 2012
@@ -336,7 +336,7 @@ parse_text_block(svn_stream_t *stream,
need to read it. */
while (content_length)
{
- if (content_length >= buflen)
+ if (content_length >= (svn_filesize_t)buflen)
rlen = buflen;
else
rlen = (apr_size_t) content_length;
@@ -659,7 +659,7 @@ svn_repos_parse_dumpstream3(svn_stream_t
/* Consume remaining bytes in this content block */
while (remaining > 0)
{
- if (remaining >= buflen)
+ if (remaining >= (svn_filesize_t)buflen)
rlen = buflen;
else
rlen = (apr_size_t) remaining;
Modified: subversion/branches/javahl-ra/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_subr/cache-membuffer.c?rev=1426103&r1=1426102&r2=1426103&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_subr/cache-membuffer.c Thu Dec 27 02:27:39 2012
@@ -362,7 +362,7 @@ typedef struct entry_t
typedef struct entry_group_t
{
/* number of entries used [0 .. USED-1] */
- apr_size_t used;
+ apr_uint32_t used;
/* the actual entries */
entry_t entries[GROUP_SIZE];
@@ -614,10 +614,10 @@ get_entry(svn_membuffer_t *cache, apr_ui
static APR_INLINE apr_uint32_t
get_index(svn_membuffer_t *cache, entry_t *entry)
{
- apr_uint32_t group_index
+ apr_size_t group_index
= ((char *)entry - (char *)cache->directory) / sizeof(entry_group_t);
- return group_index * GROUP_SIZE
+ return (apr_uint32_t)group_index * GROUP_SIZE
+ (apr_uint32_t)(entry - cache->directory[group_index].entries);
}
@@ -1186,7 +1186,7 @@ svn_cache__membuffer_cache_create(svn_me
< total_size)
++segment_count_shift;
- segment_count = 1 << segment_count_shift;
+ segment_count = (apr_size_t)1 << segment_count_shift;
}
/* If we have an extremely large cache (>512 GB), the default segment
@@ -1249,7 +1249,7 @@ svn_cache__membuffer_cache_create(svn_me
{
/* allocate buffers and initialize cache members
*/
- c[seg].segment_count = segment_count;
+ c[seg].segment_count = (apr_uint32_t)segment_count;
c[seg].group_count = group_count;
c[seg].directory = apr_pcalloc(pool,
Modified: subversion/branches/javahl-ra/subversion/libsvn_subr/spillbuf.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_subr/spillbuf.c?rev=1426103&r1=1426102&r2=1426103&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_subr/spillbuf.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_subr/spillbuf.c Thu Dec 27 02:27:39 2012
@@ -290,7 +290,7 @@ read_data(struct memblock_t **mem,
*mem = get_buffer(buf);
/* NOTE: mem's size/next are uninitialized. */
- if (buf->spill_size < buf->blocksize)
+ if ((apr_uint64_t)buf->spill_size < (apr_uint64_t)buf->blocksize)
(*mem)->size = (apr_size_t)buf->spill_size;
else
(*mem)->size = buf->blocksize; /* The size of (*mem)->data */
Modified: subversion/branches/javahl-ra/subversion/svn/mergeinfo-cmd.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/svn/mergeinfo-cmd.c?rev=1426103&r1=1426102&r2=1426103&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/branches/javahl-ra/subversion/svn/mergeinfo-cmd.c Thu Dec 27 02:27:39 2012
@@ -153,7 +153,7 @@ mergeinfo_diagram(svn_client__pathrev_t
for (row = 0; row < ROWS; row++)
{
if (g[row][col] && (strlen(g[row][col]) > col_width[col]))
- col_width[col] = strlen(g[row][col]);
+ col_width[col] = (int)strlen(g[row][col]);
}
}
Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_subr/io-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_subr/io-test.c?rev=1426103&r1=1426102&r2=1426103&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/tests/libsvn_subr/io-test.c (original)
+++ subversion/branches/javahl-ra/subversion/tests/libsvn_subr/io-test.c Thu Dec 27 02:27:39 2012
@@ -129,7 +129,7 @@ create_test_file(struct test_file_defini
int i;
if (definition->size < 5)
- SVN_ERR_ASSERT(strlen(definition->data) >= definition->size);
+ SVN_ERR_ASSERT(strlen(definition->data) >= (apr_size_t)definition->size);
else
SVN_ERR_ASSERT(strlen(definition->data) >= 5);