Updated Branches: refs/heads/master c2c4d72b9 -> f2b094f1f
THRIFT-1983 %z printf format is not available in Visual Patch: Konrad Grochowski Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/f2b094f1 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/f2b094f1 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/f2b094f1 Branch: refs/heads/master Commit: f2b094f1f1a331c9bd92c6106683fbaa7191dc66 Parents: c2c4d72 Author: Roger Meier <[email protected]> Authored: Tue Jun 4 22:09:37 2013 +0200 Committer: Roger Meier <[email protected]> Committed: Tue Jun 4 22:09:37 2013 +0200 ---------------------------------------------------------------------- lib/cpp/src/thrift/server/TNonblockingServer.cpp | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/f2b094f1/lib/cpp/src/thrift/server/TNonblockingServer.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/server/TNonblockingServer.cpp b/lib/cpp/src/thrift/server/TNonblockingServer.cpp index 641f714..69f0e55 100644 --- a/lib/cpp/src/thrift/server/TNonblockingServer.cpp +++ b/lib/cpp/src/thrift/server/TNonblockingServer.cpp @@ -64,6 +64,7 @@ #ifdef _MSC_VER #define PRIu32 "I32u" +#define PRIu64 "I64u" #endif namespace apache { namespace thrift { namespace server { @@ -478,9 +479,10 @@ void TNonblockingServer::TConnection::workSocket() { // Don't allow giant frame sizes. This prevents bad clients from // causing us to try and allocate a giant buffer. GlobalOutput.printf("TNonblockingServer: frame size too large " - "(%"PRIu32" > %zu) from client %s. remote side not " - "using TFramedTransport?", - readWant_, server_->getMaxFrameSize(), + "(%"PRIu32" > %"PRIu64") from client %s. " + "Remote side not using TFramedTransport?", + readWant_, + (uint64_t)server_->getMaxFrameSize(), tSocket_->getSocketInfo().c_str()); close(); return;
