svn commit: r1398509 - in /subversion/trunk/subversion: libsvn_fs_fs/temp_serializer.c libsvn_subr/cache-membuffer.c svnrdump/load_editor.c

[st...@apache.org]

Author: stefan2
Date: Mon Oct 15 20:53:19 2012
New Revision: 1398509

URL: http://svn.apache.org/viewvc?rev=1398509&view=rev
Log:
Fix more int conversion-related warning.

* subversion/libsvn_fs_fs/temp_serializer.c
  (svn_fs_fs__serialize_mergeinfo,
   svn_fs_fs__deserialize_mergeinfo): use matching data types for 
   iteration variables
* subversion/svnrdump/load_editor.c
  (new_node_record): ditto
* subversion/libsvn_subr/cache-membuffer.c
  (find_entry): ditto
  (svn_cache__membuffer_cache_create): prevent "constant truncated" warning

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
    subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
    subversion/trunk/subversion/svnrdump/load_editor.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c?rev=1398509&r1=1398508&r2=1398509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c Mon Oct 15 20:53:19 2012
@@ -1244,7 +1244,8 @@ svn_fs_fs__serialize_mergeinfo(void **da
   svn_temp_serializer__context_t *context;
   svn_stringbuf_t *serialized;
   apr_hash_index_t *hi;
-  int i, k;
+  unsigned i;
+  int k;
   apr_size_t range_count;
 
   /* initialize our auxiliary data structure */
@@ -1326,7 +1327,8 @@ svn_fs_fs__deserialize_mergeinfo(void **
                                  apr_size_t data_len,
                                  apr_pool_t *pool)
 {
-  int i, k, n;
+  unsigned i;
+  int k, n;
   mergeinfo_data_t *merges = (mergeinfo_data_t *)data;
   svn_mergeinfo_t mergeinfo;
   

Modified: subversion/trunk/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-membuffer.c?rev=1398509&r1=1398508&r2=1398509&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-membuffer.c Mon Oct 15 20:53:19 2012
@@ -866,7 +866,7 @@ find_entry(svn_membuffer_t *cache,
 {
   entry_group_t *group;
   entry_t *entry = NULL;
-  int i;
+  apr_size_t i;
 
   /* get the group that *must* contain the entry
    */
@@ -1145,11 +1145,13 @@ svn_cache__membuffer_cache_create(svn_me
   apr_uint64_t data_size;
   apr_uint64_t max_entry_size;
 
-  /* Limit the total size
+  /* Limit the total size (only relevant if we can address > 4GB)
    */
+#if APR_SIZEOF_VOIDP > 4
   if (total_size > MAX_SEGMENT_SIZE * MAX_SEGMENT_COUNT)
     total_size = MAX_SEGMENT_SIZE * MAX_SEGMENT_COUNT;
-  
+#endif
+
   /* Limit the segment count
    */
   if (segment_count > MAX_SEGMENT_COUNT)

Modified: subversion/trunk/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=1398509&r1=1398508&r2=1398509&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/load_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/load_editor.c Mon Oct 15 20:53:19 2012
@@ -704,6 +704,7 @@ new_node_record(void **node_baton,
       apr_size_t residual_close_count;
       apr_array_header_t *residual_open_path;
       int i;
+      apr_size_t n;
 
       /* Before attempting to handle the action, call open_directory
          for all the path components and set the directory baton
@@ -720,7 +721,7 @@ new_node_record(void **node_baton,
 
       /* First close all as many directories as there are after
          skip_ancestor, and then open fresh directories */
-      for (i = 0; i < residual_close_count; i ++)
+      for (n = 0; n < residual_close_count; n ++)
         {
           /* Don't worry about destroying the actual rb->db object,
              since the pool we're using has the lifetime of one