svn commit: r1349273 - in /subversion/trunk/subversion: libsvn_fs_fs/fs_fs.c libsvn_repos/dump.c tests/libsvn_subr/string-test.c

[st...@apache.org]

Author: stefan2
Date: Tue Jun 12 11:44:36 2012
New Revision: 1349273

URL: http://svn.apache.org/viewvc?rev=1349273&view=rev
Log:
Fix assignment / conversion warnings by using suitable types.

* libsvn_fs_fs/fs_fs.c
  (get_contents): offset calculation is done using apr_off_t
* libsvn_repos/dump.c
  (close_directory): APR arrays are being indexed by int
* tests/libsvn_subr/string-test.c
  (test24): pass unsigned 64 bit ints to svn__ui64toa

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
    subversion/trunk/subversion/libsvn_repos/dump.c
    subversion/trunk/subversion/tests/libsvn_subr/string-test.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=1349273&r1=1349272&r2=1349273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Tue Jun 12 11:44:36 2012
@@ -3837,7 +3837,8 @@ get_contents(struct rep_read_baton *rb,
              char *buf,
              apr_size_t *len)
 {
-  apr_size_t copy_len, remaining = *len, offset;
+  apr_size_t copy_len, remaining = *len;
+  apr_off_t offset;
   char *cur = buf;
   struct rep_state *rs;
 

Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1349273&r1=1349272&r2=1349273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Tue Jun 12 11:44:36 2012
@@ -736,7 +736,7 @@ close_directory(void *dir_baton,
   struct dir_baton *db = dir_baton;
   struct edit_baton *eb = db->edit_baton;
   apr_pool_t *subpool = svn_pool_create(pool);
-  unsigned int i;
+  int i;
   apr_array_header_t *sorted_entries;
 
   /* Sort entries lexically instead of as paths. Even though the entries

Modified: subversion/trunk/subversion/tests/libsvn_subr/string-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/string-test.c?rev=1349273&r1=1349272&r2=1349273&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/string-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/string-test.c Tue Jun 12 11:44:36 2012
@@ -529,11 +529,11 @@ test24(apr_pool_t *pool)
   SVN_TEST_ASSERT(length == 19);
   SVN_TEST_STRING_ASSERT(buffer, "9223372036854775807");
 
-  length = svn__ui64toa(buffer, 0);
+  length = svn__ui64toa(buffer, 0ull);
   SVN_TEST_ASSERT(length == 1);
   SVN_TEST_STRING_ASSERT(buffer, "0");
 
-  length = svn__ui64toa(buffer, 0xffffffffffffffffll);
+  length = svn__ui64toa(buffer, 0xffffffffffffffffull);
   SVN_TEST_ASSERT(length == 20);
   SVN_TEST_STRING_ASSERT(buffer, "18446744073709551615");