svn commit: r1096152 - in /subversion/trunk/subversion: libsvn_fs_fs/fs_fs.c libsvn_subr/mergeinfo.c

[stefan2]

Author: stefan2
Date: Sat Apr 23 14:06:59 2011
New Revision: 1096152

URL: http://svn.apache.org/viewvc?rev=1096152&view=rev
Log:
Fix conversion warnings.

* subversion/libsvn_fs_fs/fs_fs.c
  (read_representation): use the proper type
* subversion/libsvn_subr/mergeinfo.c
  (svn_mergeinfo__remove_prefix_from_catalog): dito

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
    subversion/trunk/subversion/libsvn_subr/mergeinfo.c

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=1096152&r1=1096151&r2=1096152&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Sat Apr 23 14:06:59 2011
@@ -3757,7 +3757,7 @@ read_representation(svn_stream_t **conte
     {
       fs_fs_data_t *ffd = fs->fsap_data;
       const char *fulltext_key = NULL;
-      apr_size_t len = rep->expanded_size ? rep->expanded_size : rep->size;
+      svn_filesize_t len = rep->expanded_size ? rep->expanded_size : rep->size;
       struct rep_read_baton *rb;
 
       if (ffd->fulltext_cache && SVN_IS_VALID_REVNUM(rep->revision)

Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=1096152&r1=1096151&r2=1096152&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Sat Apr 23 14:06:59 2011
@@ -1750,7 +1750,7 @@ svn_mergeinfo__remove_prefix_from_catalo
                                           apr_pool_t *pool)
 {
   apr_hash_index_t *hi;
-  size_t prefix_len = strlen(prefix_path);
+  apr_ssize_t prefix_len = strlen(prefix_path);
 
   SVN_ERR_ASSERT(prefix_path[0] == '/');