svn commit: r1647549 - in /subversion/trunk/subversion: libsvn_ra_serf/update.c tests/libsvn_fs_fs/fs-fs-private-test.c

[iv...@apache.org]

Author: ivan
Date: Tue Dec 23 11:23:58 2014
New Revision: 1647549

URL: http://svn.apache.org/r1647549
Log:
More signed/unsigned conversation warning fixes.

* subversion/libsvn_ra_serf/update.c
  (get_best_connection): Use proper types for connection number and 
   requests count.

* subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
  (verify_representation_stats, verify_node_stats): Change EXPECTED_COUNT 
   argument type to apr_uint64_t.
  (verify_histogram): Change SUM_COUNT and SUM_SIZE local variable type to 
   apr_uint64_t.

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/update.c
    subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=1647549&r1=1647548&r2=1647549&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/update.c Tue Dec 23 11:23:58 2014
@@ -771,7 +771,8 @@ get_best_connection(report_context_t *ct
          pending requests, thereby giving more work to lightly loaded server
          processes.
        */
-      unsigned int i, min = INT_MAX, best_conn = first_conn;
+      int i, best_conn = first_conn;
+      unsigned int min = INT_MAX;
       for (i = first_conn; i < ctx->sess->num_conns; i++)
         {
           serf_connection_t *sc = ctx->sess->conns[i]->conn;

Modified: subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c?rev=1647549&r1=1647548&r2=1647549&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c Tue Dec 23 11:23:58 2014
@@ -79,7 +79,7 @@ create_greek_repo(svn_repos_t **repos,
 
 static svn_error_t *
 verify_representation_stats(const svn_fs_fs__representation_stats_t *stats,
-                            apr_int64_t expected_count)
+                            apr_uint64_t expected_count)
 {
   /* Small items, no packing (but inefficiency due to packing attempt). */
   SVN_TEST_ASSERT(stats->total.count == expected_count);
@@ -110,7 +110,7 @@ verify_representation_stats(const svn_fs
 
 static svn_error_t *
 verify_node_stats(const svn_fs_fs__node_stats_t *node_stats,
-                  apr_int64_t expected_count)
+                  apr_uint64_t expected_count)
 {
   SVN_TEST_ASSERT(node_stats->count == expected_count);
   SVN_TEST_ASSERT(   node_stats->size > 100 * node_stats->count
@@ -162,8 +162,8 @@ verify_large_change(const svn_fs_fs__lar
 static svn_error_t *
 verify_histogram(const svn_fs_fs__histogram_t *histogram)
 {
-  apr_int64_t sum_count = 0;
-  apr_int64_t sum_size = 0;
+  apr_uint64_t sum_count = 0;
+  apr_uint64_t sum_size = 0;
 
   int i;
   for (i = 0; i < 64; ++i)