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 2012/10/15 05:50:54 UTC
svn commit: r1398190 - in /subversion/trunk/subversion:
libsvn_delta/svndiff.c libsvn_fs_fs/fs_fs.c
Author: stefan2
Date: Mon Oct 15 03:50:54 2012
New Revision: 1398190
URL: http://svn.apache.org/viewvc?rev=1398190&view=rev
Log:
* subversion/libsvn_delta/svndiff.c
(send_simple_insertion_window): fix conversion warning by explicit cast
* subversion/libsvn_fs_fs/fs_fs.c
(parse_packed_revprops,
get_contents,
get_dir_contents,
pack_revprops_shard): ditto.
Modified:
subversion/trunk/subversion/libsvn_delta/svndiff.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Modified: subversion/trunk/subversion/libsvn_delta/svndiff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/svndiff.c?rev=1398190&r1=1398189&r2=1398190&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/svndiff.c (original)
+++ subversion/trunk/subversion/libsvn_delta/svndiff.c Mon Oct 15 03:50:54 2012
@@ -219,7 +219,7 @@ send_simple_insertion_window(svn_txdelta
/* Encode the action code and length. */
if (window->tview_len >> 6 == 0)
{
- ibuf[0] = window->tview_len + (0x2 << 6);
+ ibuf[0] = (unsigned char)(window->tview_len + (0x2 << 6));
ip_len = 1;
}
else
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1398190&r1=1398189&r2=1398190&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Mon Oct 15 03:50:54 2012
@@ -3539,8 +3539,8 @@ parse_packed_revprops(svn_fs_t *fs,
revprops->packed_revprops = svn_stringbuf_create_empty(pool);
revprops->packed_revprops->data = uncompressed->data + offset;
- revprops->packed_revprops->len = uncompressed->len - offset;
- revprops->packed_revprops->blocksize = uncompressed->blocksize - offset;
+ revprops->packed_revprops->len = (apr_size_t)(uncompressed->len - offset);
+ revprops->packed_revprops->blocksize = (apr_size_t)(uncompressed->blocksize - offset);
/* STREAM still points to the first entry in the sizes list.
* Init / construct REVPROPS members. */
@@ -4872,8 +4872,8 @@ get_contents(struct rep_read_baton *rb,
offset = rs->off - rs->start;
if (copy_len + offset > rb->base_window->len)
copy_len = offset < rb->base_window->len
- ? rb->base_window->len - offset
- : 0;
+ ? (apr_size_t)(rb->base_window->len - offset)
+ : 0ul;
memcpy (cur, rb->base_window->data + offset, copy_len);
}
@@ -5235,8 +5235,8 @@ get_dir_contents(apr_hash_t *entries,
*/
apr_pool_t *text_pool = svn_pool_create(pool);
apr_size_t len = noderev->data_rep->expanded_size
- ? noderev->data_rep->expanded_size
- : noderev->data_rep->size;
+ ? (apr_size_t)noderev->data_rep->expanded_size
+ : (apr_size_t)noderev->data_rep->size;
svn_stringbuf_t *text = svn_stringbuf_create_ensure(len, text_pool);
text->len = len;
@@ -9703,7 +9703,7 @@ pack_revprops_shard(const char *pack_fil
total_size + SVN_INT64_BUFFER_SIZE + finfo.size > max_pack_size)
{
SVN_ERR(copy_revprops(pack_file_dir, pack_filename, shard_path,
- start_rev, rev-1, sizes, total_size,
+ start_rev, rev-1, sizes, (apr_size_t)total_size,
compression_level, cancel_func, cancel_baton,
iterpool));
@@ -9729,7 +9729,7 @@ pack_revprops_shard(const char *pack_fil
/* write the last pack file */
if (sizes->nelts != 0)
SVN_ERR(copy_revprops(pack_file_dir, pack_filename, shard_path,
- start_rev, rev-1, sizes, total_size,
+ start_rev, rev-1, sizes, (apr_size_t)total_size,
compression_level, cancel_func, cancel_baton,
iterpool));