Author: stefan2
Date: Tue Jun 12 12:03:33 2012
New Revision: 1349284
URL: http://svn.apache.org/viewvc?rev=1349284&view=rev
Log:
Silence conversion warnings by adding explicitly casts
* libsvn_client/patch.c
(readline, seek_to_line): always use svn_linenum_t to compare line nos
* libsvn_diff/diff_memory.c
(datasource_get_next_token): explicitly cast to unsigned as counts are >= 0
* libsvn_subr/adler32.c
(svn__adler32): cast len to 32 bits or whatever zlib supports; we only
call it for buffers < 1MB anyways.
* libsvn_subr/io.c
(stringbuf_from_aprfile): cast to unsigned as file sizes are never negative
* libsvn_subr/spillbuf.c
(read_data): same here for spillbuf sizes
* tests/libsvn_subr/mergeinfo-test.c
(test_merge_mergeinfo): cast count to int to match our internal structs
* tests/libsvn_wc/op-depth-test.c
(base_dir_insert_remove): cast up to size_t since we are working with sizes
Modified:
subversion/trunk/subversion/libsvn_client/patch.c
subversion/trunk/subversion/libsvn_diff/diff_memory.c
subversion/trunk/subversion/libsvn_subr/adler32.c
subversion/trunk/subversion/libsvn_subr/io.c
subversion/trunk/subversion/libsvn_subr/spillbuf.c
subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=1349284&r1=1349283&r2=1349284&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Tue Jun 12 12:03:33 2012
@@ -1020,6 +1020,7 @@ readline(target_content_t *content,
{
svn_stringbuf_t *line_raw;
const char *eol_str;
+ svn_linenum_t max_line = (svn_linenum_t)content->lines->nelts + 1;
if (content->eof || content->readline == NULL)
{
@@ -1027,8 +1028,8 @@ readline(target_content_t *content,
return SVN_NO_ERROR;
}
- SVN_ERR_ASSERT(content->current_line <= content->lines->nelts + 1);
- if (content->current_line == content->lines->nelts + 1)
+ SVN_ERR_ASSERT(content->current_line <= max_line);
+ if (content->current_line == max_line)
{
apr_off_t offset;
@@ -1073,7 +1074,7 @@ seek_to_line(target_content_t *content,
saved_line = content->current_line;
saved_eof = content->eof;
- if (line <= content->lines->nelts)
+ if (line <= (svn_linenum_t)content->lines->nelts)
{
apr_off_t offset;
Modified: subversion/trunk/subversion/libsvn_diff/diff_memory.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/diff_memory.c?rev=1349284&r1=1349283&r2=1349284&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/diff_memory.c (original)
+++ subversion/trunk/subversion/libsvn_diff/diff_memory.c Tue Jun 12 12:03:33
2012
@@ -123,7 +123,7 @@ datasource_get_next_token(apr_uint32_t *
diff_mem_baton_t *mem_baton = baton;
source_tokens_t *src =
&(mem_baton->sources[datasource_to_index(datasource)]);
- if (src->tokens->nelts > src->next_token)
+ if ((apr_size_t)src->tokens->nelts > src->next_token)
{
/* There are actually tokens to be returned */
char *buf = mem_baton->normalization_buf[0];
Modified: subversion/trunk/subversion/libsvn_subr/adler32.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/adler32.c?rev=1349284&r1=1349283&r2=1349284&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/adler32.c (original)
+++ subversion/trunk/subversion/libsvn_subr/adler32.c Tue Jun 12 12:03:33 2012
@@ -61,7 +61,7 @@ svn__adler32(apr_uint32_t checksum, cons
* optimized code. Also, new zlib versions will come with
* SIMD code for x86 and x64.
*/
- return adler32(checksum, (const Bytef *)data, len);
+ return adler32(checksum, (const Bytef *)data, (uInt)len);
}
else
{
Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1349284&r1=1349283&r2=1349284&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Tue Jun 12 12:03:33 2012
@@ -2126,7 +2126,7 @@ stringbuf_from_aprfile(svn_stringbuf_t *
{
apr_finfo_t finfo;
if (! (status = apr_stat(&finfo, filename, APR_FINFO_MIN, pool)))
- res_initial_len = finfo.size;
+ res_initial_len = (apr_size_t)finfo.size;
}
}
Modified: subversion/trunk/subversion/libsvn_subr/spillbuf.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/spillbuf.c?rev=1349284&r1=1349283&r2=1349284&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/spillbuf.c (original)
+++ subversion/trunk/subversion/libsvn_subr/spillbuf.c Tue Jun 12 12:03:33 2012
@@ -291,7 +291,7 @@ read_data(struct memblock_t **mem,
/* NOTE: mem's size/next are uninitialized. */
if (buf->spill_size < buf->blocksize)
- (*mem)->size = buf->spill_size;
+ (*mem)->size = (apr_size_t)buf->spill_size;
else
(*mem)->size = buf->blocksize; /* The size of (*mem)->data */
(*mem)->next = NULL;
Modified: subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1349284&r1=1349283&r2=1349284&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c Tue Jun 12
12:03:33 2012
@@ -712,7 +712,7 @@ test_merge_mergeinfo(apr_pool_t *pool)
SVN_ERR(svn_mergeinfo_to_string(&info2_starting, info2, pool));
SVN_ERR(svn_mergeinfo_merge(info1, info2, pool));
- if (mergeinfo[i].expected_paths != apr_hash_count(info1))
+ if (mergeinfo[i].expected_paths != (int)apr_hash_count(info1))
return fail(pool, "Wrong number of paths in merged mergeinfo");
/* Check that info2 remained unchanged. */
Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1349284&r1=1349283&r2=1349284&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Tue Jun 12
12:03:33 2012
@@ -1277,7 +1277,7 @@ base_dir_insert_remove(svn_test__sandbox
NULL, NULL, FALSE, NULL, NULL,
b->pool));
- after = apr_palloc(b->pool, sizeof(*after) * (num_before + num_added + 1));
+ after = apr_palloc(b->pool, sizeof(*after) * (apr_size_t)(num_before +
num_added + 1));
for (i = 0; i < num_before; ++i)
after[i] = before[i];
for (i = 0; i < num_added; ++i)
