svn commit: r1575890 - /subversion/trunk/subversion/libsvn_fs_x/noderevs.c

[stefan2]

Author: stefan2
Date: Mon Mar 10 10:30:25 2014
New Revision: 1575890

URL: http://svn.apache.org/r1575890
Log:
Fix a few 64 -> 32 integer conversion warnings in FSX.

* subversion/libsvn_fs_x/noderevs.c
  (binary_noderev_t): Use apr_size_t as string index.
  (svn_fs_x__read_noderevs_container): Update stream -> struct conversions.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/noderevs.c

Modified: subversion/trunk/subversion/libsvn_fs_x/noderevs.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/noderevs.c?rev=1575890&r1=1575889&r2=1575890&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/noderevs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/noderevs.c Mon Mar 10 10:30:25 2014
@@ -115,11 +115,11 @@ typedef struct binary_noderev_t
 
   /* If this node-rev is a copy, this is the string index+1 of the path
      from which that copy way made. 0, otherwise. */
-  int copyfrom_path;
+  apr_size_t copyfrom_path;
 
   /* String index+1 of the root of the parent tree from whence this node-
    * rev was copied. */
-  int copyroot_path;
+  apr_size_t copyroot_path;
 
   /* Index+1 of the representation key for this node's properties.
      May be 0 if there are no properties.  */
@@ -131,7 +131,7 @@ typedef struct binary_noderev_t
 
   /* String index+1 of the path at which this node first came into
      existence.  */
-  int created_path;
+  apr_size_t created_path;
 
   /* Number of nodes with svn:mergeinfo properties that are
      descendants of this node (including it itself) */
@@ -776,15 +776,15 @@ svn_fs_x__read_noderevs_container(svn_fs
       noderev.predecessor_id = (int)svn_packed__get_uint(noderevs_stream);
       noderev.predecessor_count = (int)svn_packed__get_uint(noderevs_stream);
 
-      noderev.copyfrom_path = (int)svn_packed__get_uint(noderevs_stream);
+      noderev.copyfrom_path = 
(apr_size_t)svn_packed__get_uint(noderevs_stream);
       noderev.copyfrom_rev = 
(svn_revnum_t)svn_packed__get_int(noderevs_stream);
-      noderev.copyroot_path = (int)svn_packed__get_uint(noderevs_stream);
+      noderev.copyroot_path = 
(apr_size_t)svn_packed__get_uint(noderevs_stream);
       noderev.copyroot_rev = 
(svn_revnum_t)svn_packed__get_int(noderevs_stream);
 
       noderev.prop_rep = (int)svn_packed__get_uint(noderevs_stream);
       noderev.data_rep = (int)svn_packed__get_uint(noderevs_stream);
 
-      noderev.created_path = (int)svn_packed__get_uint(noderevs_stream);
+      noderev.created_path = (apr_size_t)svn_packed__get_uint(noderevs_stream);
       noderev.mergeinfo_count = svn_packed__get_uint(noderevs_stream);
 
       APR_ARRAY_PUSH(noderevs->noderevs, binary_noderev_t) = noderev;