commit beaa35724c4eb67eb5f890d6f66e0fd3b2f50aaa
author Yuchen Zeng <zyc@google.com> Fri Jun 10 15:46:14 2016 -0700
committer Yuchen Zeng <zyc@google.com> Fri Jun 10 15:46:14 2016 -0700
tree fab633b866d774e2a031286abd8650832665a37c
parent 0ba114408ebb153b29c85dd8be9847095a6a6954

Fix type mismatch for type_size

test/cpp/end2end/async_end2end_test.cc

diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc
index 5915187..8229bda 100644
--- a/test/cpp/end2end/async_end2end_test.cc
+++ b/test/cpp/end2end/async_end2end_test.cc
@@ -229,10 +229,10 @@
         credentials_type(creds_type),
         message_content(content) {}
   void Log() const {
-    gpr_log(GPR_INFO,
-            "Scenario: disable_blocking %d, credentials %s, message size %d",
-            disable_blocking, credentials_type.c_str(),
-            (int)(message_content.size()));
+    gpr_log(
+        GPR_INFO,
+        "Scenario: disable_blocking %d, credentials %s, message size %" PRIuPTR,
+        disable_blocking, credentials_type.c_str(), message_content.size());
   }
   bool disable_blocking;
   const grpc::string credentials_type;

test/cpp/end2end/zookeeper_test.cc

diff --git a/test/cpp/end2end/zookeeper_test.cc b/test/cpp/end2end/zookeeper_test.cc
index 12853a1..b44668f 100644
--- a/test/cpp/end2end/zookeeper_test.cc
+++ b/test/cpp/end2end/zookeeper_test.cc
@@ -101,7 +101,7 @@
       zookeeper_address_ = addr_str;
       gpr_free(addr);
     }
-    gpr_log(GPR_DEBUG, zookeeper_address_.c_str());
+    gpr_log(GPR_DEBUG, "%s, " zookeeper_address_.c_str());
 
     // Connects to zookeeper server
     zoo_set_debug_level(ZOO_LOG_LEVEL_WARN);

test/cpp/interop/interop_client.cc

diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc
index f9813f3..0bf1fd6 100644
--- a/test/cpp/interop/interop_client.cc
+++ b/test/cpp/interop/interop_client.cc
@@ -433,7 +433,7 @@
     // most likely due to connection failure.
     gpr_log(GPR_ERROR,
             "DoResponseStreaming(): Read fewer streams (%d) than "
-            "response_stream_sizes.size() (%" PRIu64 ")",
+            "response_stream_sizes.size() (%" PRIuPTR ")",
             i, response_stream_sizes.size());
     return TransientFailureOrAbort();
   }
@@ -520,7 +520,7 @@
                 "DoResponseCompressedStreaming(): Responses read (k=%" PRIuPTR
                 ") is "
                 "less than the expected messages (i.e "
-                "response_stream_sizes.size() (%" PRIu64 ")). (i=%" PRIuPTR
+                "response_stream_sizes.size() (%" PRIuPTR ")). (i=%" PRIuPTR
                 ", j=%" PRIuPTR ")",
                 k, response_stream_sizes.size(), i, j);
         return TransientFailureOrAbort();
@@ -610,7 +610,7 @@
     // most likely due to a connection failure
     gpr_log(GPR_ERROR,
             "DoHalfDuplex(): Responses read (i=%d) are less than the expected "
-            "number of messages response_stream_sizes.size() (%" PRIu64 ")",
+            "number of messages response_stream_sizes.size() (%" PRIuPTR ")",
             i, response_stream_sizes.size());
     return TransientFailureOrAbort();
   }