Author: stefan2
Date: Sun Nov 4 11:39:56 2012
New Revision: 1405530
URL: http://svn.apache.org/viewvc?rev=1405530&view=rev
Log:
Silence size conversion warnings under Win64 where it is safe to to so
because we know the actual value ranges.
* subversion/libsvn_repos/load.c
(parse_text_block,
svn_repos_parse_dumpstream3): bufflen is limited by stream chunk size
* subversion/svn/mergeinfo-cmd.c
(mergeinfo_diagram): those text snippets are short
* subversion/tests/libsvn_subr/io-test.c
(create_test_file): size is <= 5
Modified:
subversion/trunk/subversion/libsvn_repos/load.c
subversion/trunk/subversion/svn/mergeinfo-cmd.c
subversion/trunk/subversion/tests/libsvn_subr/io-test.c
Modified: subversion/trunk/subversion/libsvn_repos/load.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/load.c?rev=1405530&r1=1405529&r2=1405530&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/load.c (original)
+++ subversion/trunk/subversion/libsvn_repos/load.c Sun Nov 4 11:39:56 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/trunk/subversion/svn/mergeinfo-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/mergeinfo-cmd.c?rev=1405530&r1=1405529&r2=1405530&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/mergeinfo-cmd.c (original)
+++ subversion/trunk/subversion/svn/mergeinfo-cmd.c Sun Nov 4 11:39:56 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/trunk/subversion/tests/libsvn_subr/io-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/io-test.c?rev=1405530&r1=1405529&r2=1405530&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/io-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/io-test.c Sun Nov 4 11:39:56
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);
