Always use int64_t to store ProcessBytes() return value.
Casting integers can be dangerous. Avoid doing it implicitly, prefer explicit
cast where Chromium's -Wsign-compare rule makes it necessary.
PiperOrigin-RevId: 389942980
diff --git a/http2/adapter/nghttp2_adapter_test.cc b/http2/adapter/nghttp2_adapter_test.cc
index de601d2..5861e66 100644
--- a/http2/adapter/nghttp2_adapter_test.cc
+++ b/http2/adapter/nghttp2_adapter_test.cc
@@ -81,7 +81,7 @@
EXPECT_CALL(visitor, OnFrameHeader(0, 4, WINDOW_UPDATE, 0));
EXPECT_CALL(visitor, OnWindowUpdate(0, 1000));
- const ssize_t initial_result = adapter->ProcessBytes(initial_frames);
+ const int64_t initial_result = adapter->ProcessBytes(initial_frames);
EXPECT_EQ(initial_frames.size(), initial_result);
EXPECT_EQ(adapter->GetSendWindowSize(), kInitialFlowControlWindowSize + 1000);
@@ -202,7 +202,7 @@
EXPECT_CALL(visitor, OnFrameHeader(0, 19, GOAWAY, 0));
EXPECT_CALL(visitor,
OnGoAway(5, Http2ErrorCode::ENHANCE_YOUR_CALM, "calm down!!"));
- const ssize_t stream_result = adapter->ProcessBytes(stream_frames);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
EXPECT_EQ(stream_frames.size(), stream_result);
// First stream has received some data.
@@ -321,7 +321,7 @@
EXPECT_CALL(visitor, OnEndStream(1));
EXPECT_CALL(visitor, OnCloseStream(1, Http2ErrorCode::NO_ERROR));
- const ssize_t stream_result = adapter->ProcessBytes(stream_frames);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
EXPECT_EQ(stream_frames.size(), stream_result);
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, _, 0x1));
@@ -401,7 +401,7 @@
EXPECT_CALL(visitor, OnEndStream(1));
EXPECT_CALL(visitor, OnCloseStream(1, Http2ErrorCode::NO_ERROR));
- const ssize_t stream_result = adapter->ProcessBytes(stream_frames);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
EXPECT_EQ(stream_frames.size(), stream_result);
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, _, 0x1));
@@ -474,7 +474,7 @@
// Remaining frames are not processed due to the error.
EXPECT_CALL(visitor, OnConnectionError());
- const ssize_t stream_result = adapter->ProcessBytes(stream_frames);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
// The false return from OnMetadataForStream() results in a connection error.
EXPECT_EQ(stream_result, NGHTTP2_ERR_CALLBACK_FAILURE);
@@ -556,7 +556,7 @@
// Bad status trailer will cause a PROTOCOL_ERROR. The header is never
// delivered in an OnHeaderForStream callback.
- const ssize_t stream_result = adapter->ProcessBytes(stream_frames);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
EXPECT_EQ(stream_frames.size(), stream_result);
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, 0, 0x1));
@@ -629,7 +629,7 @@
}),
testing::Return(Http2VisitorInterface::HEADER_RST_STREAM)));
- const ssize_t stream_result = adapter->ProcessBytes(stream_frames);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
EXPECT_EQ(stream_frames.size(), stream_result);
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, 0, 0x1));
@@ -702,7 +702,7 @@
testing::Return(Http2VisitorInterface::HEADER_CONNECTION_ERROR));
EXPECT_CALL(visitor, OnConnectionError());
- const ssize_t stream_result = adapter->ProcessBytes(stream_frames);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
EXPECT_EQ(-902 /* NGHTTP2_ERR_CALLBACK_FAILURE */, stream_result);
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, 0, 0x1));
@@ -765,7 +765,7 @@
// Rejecting headers leads to a connection error.
EXPECT_CALL(visitor, OnConnectionError());
- const ssize_t stream_result = adapter->ProcessBytes(stream_frames);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
EXPECT_EQ(NGHTTP2_ERR_CALLBACK_FAILURE, stream_result);
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, 0, 0x1));
@@ -796,7 +796,7 @@
EXPECT_CALL(visitor, OnSettingsStart());
EXPECT_CALL(visitor, OnSettingsEnd());
- const ssize_t initial_result = adapter->ProcessBytes(initial_frames);
+ const int64_t initial_result = adapter->ProcessBytes(initial_frames);
EXPECT_EQ(initial_frames.size(), initial_result);
EXPECT_TRUE(adapter->session().want_write());
@@ -902,7 +902,7 @@
EXPECT_CALL(visitor, OnSettingsStart());
EXPECT_CALL(visitor, OnSettingsEnd());
- const ssize_t initial_result = adapter->ProcessBytes(initial_frames);
+ const int64_t initial_result = adapter->ProcessBytes(initial_frames);
EXPECT_EQ(initial_frames.size(), initial_result);
EXPECT_TRUE(adapter->session().want_write());
@@ -1193,7 +1193,7 @@
EXPECT_CALL(visitor, OnFrameHeader(0, 8, PING, 0));
EXPECT_CALL(visitor, OnPing(47, false));
- const ssize_t result = adapter->ProcessBytes(frames);
+ const int64_t result = adapter->ProcessBytes(frames);
EXPECT_EQ(frames.size(), result);
EXPECT_EQ(kSentinel1, adapter->GetStreamUserData(1));
@@ -1274,7 +1274,7 @@
EXPECT_CALL(visitor, OnFrameHeader(0, 4, WINDOW_UPDATE, 0));
EXPECT_CALL(visitor, OnWindowUpdate(0, 2000));
- const ssize_t result = adapter->ProcessBytes(frames);
+ const int64_t result = adapter->ProcessBytes(frames);
EXPECT_EQ(frames.size(), result);
EXPECT_TRUE(adapter->session().want_write());
@@ -1330,7 +1330,7 @@
}));
EXPECT_CALL(visitor, OnEndStream(1));
- const ssize_t result = adapter->ProcessBytes(frames);
+ const int64_t result = adapter->ProcessBytes(frames);
EXPECT_EQ(frames.size(), result);
EXPECT_EQ(1, adapter->GetHighestReceivedStreamId());
@@ -1419,7 +1419,7 @@
EXPECT_CALL(visitor, OnHeaderForStream(1, ":path", "/this/is/request/one"));
EXPECT_CALL(visitor, OnEndHeadersForStream(1));
- const ssize_t result = adapter->ProcessBytes(frames);
+ const int64_t result = adapter->ProcessBytes(frames);
EXPECT_EQ(frames.size(), result);
adapter->SubmitShutdownNotice();
@@ -1467,7 +1467,7 @@
EXPECT_CALL(visitor, OnEndHeadersForStream(1));
EXPECT_CALL(visitor, OnEndStream(1));
- const ssize_t result = adapter->ProcessBytes(frames);
+ const int64_t result = adapter->ProcessBytes(frames);
EXPECT_EQ(frames.size(), result);
// Server will want to send a SETTINGS ack.
@@ -1555,7 +1555,7 @@
EXPECT_CALL(visitor, OnEndHeadersForStream(1));
EXPECT_CALL(visitor, OnEndStream(1));
- const size_t result = adapter->ProcessBytes(frames);
+ const int64_t result = adapter->ProcessBytes(frames);
EXPECT_EQ(frames.size(), result);
}
@@ -1612,7 +1612,7 @@
EXPECT_CALL(visitor, OnMetadataForStream(1, _));
EXPECT_CALL(visitor, OnMetadataEndForStream(1));
- const size_t result = adapter->ProcessBytes(frames);
+ const int64_t result = adapter->ProcessBytes(frames);
EXPECT_EQ(frames.size(), result);
EXPECT_EQ(TestFrameSequence::MetadataBlockForPayload(
"Example connection metadata in multiple frames"),
@@ -1652,7 +1652,7 @@
EXPECT_CALL(visitor, OnEndHeadersForStream(1));
EXPECT_CALL(visitor, OnEndStream(1));
- const ssize_t result = adapter->ProcessBytes(frames);
+ const int64_t result = adapter->ProcessBytes(frames);
EXPECT_EQ(frames.size(), result);
const absl::string_view kBody = "This is an example response body.";
diff --git a/http2/adapter/nghttp2_session_test.cc b/http2/adapter/nghttp2_session_test.cc
index 487843b..bc49160 100644
--- a/http2/adapter/nghttp2_session_test.cc
+++ b/http2/adapter/nghttp2_session_test.cc
@@ -77,7 +77,7 @@
EXPECT_CALL(visitor_, OnFrameHeader(0, 4, WINDOW_UPDATE, 0));
EXPECT_CALL(visitor_, OnWindowUpdate(0, 1000));
- const ssize_t initial_result = session.ProcessBytes(initial_frames);
+ const int64_t initial_result = session.ProcessBytes(initial_frames);
EXPECT_EQ(initial_frames.size(), initial_result);
EXPECT_EQ(session.GetRemoteWindowSize(),
@@ -176,7 +176,7 @@
EXPECT_CALL(visitor_, OnFrameHeader(0, 19, GOAWAY, 0));
EXPECT_CALL(visitor_,
OnGoAway(5, Http2ErrorCode::ENHANCE_YOUR_CALM, "calm down!!"));
- const ssize_t stream_result = session.ProcessBytes(stream_frames);
+ const int64_t stream_result = session.ProcessBytes(stream_frames);
EXPECT_EQ(stream_frames.size(), stream_result);
// Even though the client recieved a GOAWAY, streams 1 and 5 are still active.
@@ -275,7 +275,7 @@
EXPECT_CALL(visitor_, OnFrameHeader(0, 8, PING, 0));
EXPECT_CALL(visitor_, OnPing(47, false));
- const ssize_t result = session.ProcessBytes(frames);
+ const int64_t result = session.ProcessBytes(frames);
EXPECT_EQ(frames.size(), result);
EXPECT_EQ(session.GetRemoteWindowSize(),
diff --git a/http2/adapter/oghttp2_adapter_test.cc b/http2/adapter/oghttp2_adapter_test.cc
index d5a254a..96c52be 100644
--- a/http2/adapter/oghttp2_adapter_test.cc
+++ b/http2/adapter/oghttp2_adapter_test.cc
@@ -124,8 +124,8 @@
EXPECT_CALL(visitor, OnEndStream(1));
EXPECT_CALL(visitor, OnCloseStream(1, Http2ErrorCode::NO_ERROR));
- const size_t stream_result = adapter->ProcessBytes(stream_frames);
- EXPECT_EQ(stream_frames.size(), stream_result);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
+ EXPECT_EQ(stream_frames.size(), static_cast<size_t>(stream_result));
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, _, 0x1));
EXPECT_CALL(visitor, OnFrameSent(SETTINGS, 0, _, 0x1, 0));
@@ -208,8 +208,8 @@
EXPECT_CALL(visitor, OnEndStream(1));
EXPECT_CALL(visitor, OnCloseStream(1, Http2ErrorCode::NO_ERROR));
- const size_t stream_result = adapter->ProcessBytes(stream_frames);
- EXPECT_EQ(stream_frames.size(), stream_result);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
+ EXPECT_EQ(stream_frames.size(), static_cast<size_t>(stream_result));
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, _, 0x1));
EXPECT_CALL(visitor, OnFrameSent(SETTINGS, 0, _, 0x1, 0));
@@ -284,10 +284,10 @@
// Remaining frames are not processed due to the error.
EXPECT_CALL(visitor, OnConnectionError());
- const size_t stream_result = adapter->ProcessBytes(stream_frames);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
// Unlike nghttp2, this adapter implementation returns the number of bytes
// actually processed.
- EXPECT_LT(stream_result, stream_frames.size());
+ EXPECT_LT(static_cast<size_t>(stream_result), stream_frames.size());
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, _, 0x1));
EXPECT_CALL(visitor, OnFrameSent(SETTINGS, 0, _, 0x1, 0));
@@ -363,8 +363,8 @@
EXPECT_CALL(visitor, OnBeginDataForStream(1, _));
EXPECT_CALL(visitor, OnDataForStream(1, "This is the response body."));
- const size_t stream_result = adapter->ProcessBytes(stream_frames);
- EXPECT_EQ(stream_frames.size(), stream_result);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
+ EXPECT_EQ(stream_frames.size(), static_cast<size_t>(stream_result));
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, 0, 0x1));
EXPECT_CALL(visitor, OnFrameSent(SETTINGS, 0, 0, 0x1, 0));
@@ -445,8 +445,8 @@
EXPECT_CALL(visitor, OnBeginDataForStream(1, _));
EXPECT_CALL(visitor, OnDataForStream(1, "This is the response body."));
- const size_t stream_result = adapter->ProcessBytes(stream_frames);
- EXPECT_EQ(stream_frames.size(), stream_result);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
+ EXPECT_EQ(stream_frames.size(), static_cast<size_t>(stream_result));
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, 0, 0x1));
EXPECT_CALL(visitor, OnFrameSent(SETTINGS, 0, 0, 0x1, 0));
@@ -517,8 +517,8 @@
EXPECT_CALL(visitor, OnBeginDataForStream(1, _));
EXPECT_CALL(visitor, OnDataForStream(1, "This is the response body."));
- const size_t stream_result = adapter->ProcessBytes(stream_frames);
- EXPECT_EQ(stream_result, stream_frames.size());
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
+ EXPECT_EQ(static_cast<size_t>(stream_result), stream_frames.size());
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, 0, 0x1));
EXPECT_CALL(visitor, OnFrameSent(SETTINGS, 0, 0, 0x1, 0));
@@ -597,8 +597,8 @@
// Bad status trailer will cause a PROTOCOL_ERROR. The header is never
// delivered in an OnHeaderForStream callback.
- const size_t stream_result = adapter->ProcessBytes(stream_frames);
- EXPECT_EQ(stream_frames.size(), stream_result);
+ const int64_t stream_result = adapter->ProcessBytes(stream_frames);
+ EXPECT_EQ(stream_frames.size(), static_cast<size_t>(stream_result));
EXPECT_CALL(visitor, OnBeforeFrameSent(SETTINGS, 0, 0, 0x1));
EXPECT_CALL(visitor, OnFrameSent(SETTINGS, 0, 0, 0x1, 0));
@@ -765,8 +765,8 @@
EXPECT_CALL(visitor, OnEndHeadersForStream(1));
EXPECT_CALL(visitor, OnEndStream(1));
- const size_t result = adapter->ProcessBytes(frames);
- EXPECT_EQ(frames.size(), result);
+ const int64_t result = adapter->ProcessBytes(frames);
+ EXPECT_EQ(frames.size(), static_cast<size_t>(result));
}
TEST(OgHttp2AdapterServerTest, ClientSendsMetadataWithContinuation) {
@@ -823,8 +823,8 @@
EXPECT_CALL(visitor, OnMetadataForStream(1, _));
EXPECT_CALL(visitor, OnMetadataEndForStream(1));
- const size_t result = adapter->ProcessBytes(frames);
- EXPECT_EQ(frames.size(), result);
+ const int64_t result = adapter->ProcessBytes(frames);
+ EXPECT_EQ(frames.size(), static_cast<size_t>(result));
EXPECT_EQ(TestFrameSequence::MetadataBlockForPayload(
"Example connection metadata in multiple frames"),
absl::StrJoin(visitor.GetMetadata(0), ""));
@@ -864,8 +864,8 @@
EXPECT_CALL(visitor, OnEndHeadersForStream(1));
EXPECT_CALL(visitor, OnEndStream(1));
- const size_t result = adapter->ProcessBytes(frames);
- EXPECT_EQ(frames.size(), result);
+ const int64_t result = adapter->ProcessBytes(frames);
+ EXPECT_EQ(frames.size(), static_cast<size_t>(result));
const absl::string_view kBody = "This is an example response body.";
@@ -954,8 +954,8 @@
EXPECT_CALL(visitor, OnFrameHeader(0, 4, WINDOW_UPDATE, 0));
EXPECT_CALL(visitor, OnWindowUpdate(0, 2000));
- const size_t result = adapter->ProcessBytes(frames);
- EXPECT_EQ(frames.size(), result);
+ const int64_t result = adapter->ProcessBytes(frames);
+ EXPECT_EQ(frames.size(), static_cast<size_t>(result));
EXPECT_TRUE(adapter->session().want_write());
diff --git a/http2/adapter/oghttp2_session_test.cc b/http2/adapter/oghttp2_session_test.cc
index 3f24ea2..3a96355 100644
--- a/http2/adapter/oghttp2_session_test.cc
+++ b/http2/adapter/oghttp2_session_test.cc
@@ -60,8 +60,8 @@
EXPECT_CALL(visitor, OnFrameHeader(0, 4, WINDOW_UPDATE, 0));
EXPECT_CALL(visitor, OnWindowUpdate(0, 1000));
- const size_t initial_result = session.ProcessBytes(initial_frames);
- EXPECT_EQ(initial_frames.size(), initial_result);
+ const int64_t initial_result = session.ProcessBytes(initial_frames);
+ EXPECT_EQ(initial_frames.size(), static_cast<size_t>(initial_result));
EXPECT_EQ(session.GetRemoteWindowSize(),
kInitialFlowControlWindowSize + 1000);
@@ -116,8 +116,8 @@
EXPECT_CALL(visitor, OnCloseStream(3, Http2ErrorCode::INTERNAL_ERROR));
EXPECT_CALL(visitor, OnFrameHeader(0, 19, GOAWAY, 0));
EXPECT_CALL(visitor, OnGoAway(5, Http2ErrorCode::ENHANCE_YOUR_CALM, ""));
- const size_t stream_result = session.ProcessBytes(stream_frames);
- EXPECT_EQ(stream_frames.size(), stream_result);
+ const int64_t stream_result = session.ProcessBytes(stream_frames);
+ EXPECT_EQ(stream_frames.size(), static_cast<size_t>(stream_result));
EXPECT_EQ(3, session.GetHighestReceivedStreamId());
// The first stream is active and has received some data.
@@ -231,8 +231,8 @@
EXPECT_CALL(visitor, OnSettingsStart());
EXPECT_CALL(visitor, OnSettingsEnd());
- const size_t initial_result = session.ProcessBytes(initial_frames);
- EXPECT_EQ(initial_frames.size(), initial_result);
+ const int64_t initial_result = session.ProcessBytes(initial_frames);
+ EXPECT_EQ(initial_frames.size(), static_cast<size_t>(initial_result));
// Session will want to write a SETTINGS ack.
EXPECT_TRUE(session.want_write());
@@ -570,8 +570,8 @@
EXPECT_CALL(visitor, OnFrameHeader(0, 8, PING, 0));
EXPECT_CALL(visitor, OnPing(47, false));
- const size_t result = session.ProcessBytes(frames);
- EXPECT_EQ(frames.size(), result);
+ const int64_t result = session.ProcessBytes(frames);
+ EXPECT_EQ(frames.size(), static_cast<size_t>(result));
EXPECT_EQ(kSentinel1, session.GetStreamUserData(1));
@@ -689,8 +689,8 @@
}));
EXPECT_CALL(visitor, OnEndStream(1));
- const size_t result = session.ProcessBytes(frames);
- EXPECT_EQ(frames.size(), result);
+ const int64_t result = session.ProcessBytes(frames);
+ EXPECT_EQ(frames.size(), static_cast<size_t>(result));
EXPECT_EQ(1, session.GetHighestReceivedStreamId());
@@ -830,8 +830,8 @@
EXPECT_CALL(visitor, OnEndHeadersForStream(1));
EXPECT_CALL(visitor, OnEndStream(1));
- const size_t result = session.ProcessBytes(frames);
- EXPECT_EQ(frames.size(), result);
+ const int64_t result = session.ProcessBytes(frames);
+ EXPECT_EQ(frames.size(), static_cast<size_t>(result));
// Server will want to send initial SETTINGS, and a SETTINGS ack.
EXPECT_TRUE(session.want_write());
@@ -922,8 +922,8 @@
EXPECT_CALL(visitor, OnEndHeadersForStream(1));
EXPECT_CALL(visitor, OnEndStream(1));
- const size_t result = session.ProcessBytes(frames);
- EXPECT_EQ(frames.size(), result);
+ const int64_t result = session.ProcessBytes(frames);
+ EXPECT_EQ(frames.size(), static_cast<size_t>(result));
// Server will want to send initial SETTINGS, and a SETTINGS ack.
EXPECT_TRUE(session.want_write());
