Skip to content

Commit

Permalink
Fix signed/unsigned comparisons
Browse files Browse the repository at this point in the history 
In many places in the tests, an unsigned variable is compared to an
integer constant.  This emits compiler warnings, because the integer
constant is interpreted to be signed.  This commit adds "U", "UL", and
"ULL" -- as relevant -- to integer constants to make the LHS and RHS
agree (and therefore not emit compiler warnings).

Signed-off-by: Jeff Squyres <jeff@squyres.com>
  • Loading branch information
@jsquyres
jsquyres committed May 9, 2019
1 parent 3ce6cac commit 8a48198
Show file tree
Hide file tree
Showing 17 changed files with 370 additions and 370 deletions.
116 changes: 58 additions & 58 deletions quic/api/test/QuicTransportTest.cpp
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion quic/client/QuicClientTransport.cpp
View file
Expand Up @@ -993,7 +993,7 @@ bool QuicClientTransport::isTLSResumed() const {
return clientConn_->clientHandshakeLayer->isTLSResumed();
}

void QuicClientTransport::errMessage(const cmsghdr& cmsg) noexcept {
void QuicClientTransport::errMessage(FOLLY_MAYBE_UNUSED const cmsghdr& cmsg) noexcept {
#ifdef FOLLY_HAVE_MSG_ERRQUEUE
if ((cmsg.cmsg_level == SOL_IP && cmsg.cmsg_type == IP_RECVERR) ||
(cmsg.cmsg_level == SOL_IPV6 && cmsg.cmsg_type == IPV6_RECVERR)) {
Expand Down
24 changes: 12 additions & 12 deletions quic/common/test/FunctionLooperTest.cpp
View file
Expand Up @@ -166,11 +166,11 @@ TEST(FunctionLooperTest, PacingOnce) {
looper->setPacingFunction(std::move(pacingFunc));
looper->run();
evb.loopOnce();
EXPECT_EQ(1, fromTimerVec.size());
EXPECT_EQ(1UL, fromTimerVec.size());
EXPECT_EQ(false, fromTimerVec.back());
EXPECT_TRUE(looper->isScheduled());
looper->timeoutExpired();
EXPECT_EQ(2, fromTimerVec.size());
EXPECT_EQ(2UL, fromTimerVec.size());
EXPECT_EQ(true, fromTimerVec.back());
looper->stop();
}
Expand All @@ -193,29 +193,29 @@ TEST(FunctionLooperTest, KeepPacing) {
looper->setPacingFunction(std::move(pacingFunc));
looper->run();
evb.loopOnce();
EXPECT_EQ(1, fromTimerVec.size());
EXPECT_EQ(1UL, fromTimerVec.size());
EXPECT_EQ(false, fromTimerVec.back());
EXPECT_TRUE(looper->isScheduled());

looper->cancelTimeout();
EXPECT_FALSE(looper->isScheduled());
looper->timeoutExpired();
EXPECT_EQ(2, fromTimerVec.size());
EXPECT_EQ(2UL, fromTimerVec.size());
EXPECT_EQ(true, fromTimerVec.back());
EXPECT_TRUE(looper->isScheduled());

looper->cancelTimeout();
EXPECT_FALSE(looper->isScheduled());
looper->timeoutExpired();
EXPECT_EQ(3, fromTimerVec.size());
EXPECT_EQ(3UL, fromTimerVec.size());
EXPECT_EQ(true, fromTimerVec.back());
EXPECT_TRUE(looper->isScheduled());

stopPacing = true;
looper->cancelTimeout();
EXPECT_FALSE(looper->isScheduled());
looper->timeoutExpired();
EXPECT_EQ(4, fromTimerVec.size());
EXPECT_EQ(4UL, fromTimerVec.size());
EXPECT_EQ(true, fromTimerVec.back());
EXPECT_FALSE(looper->isScheduled());

Expand Down Expand Up @@ -291,20 +291,20 @@ TEST(FunctionLooperTest, RunConditions) {
// Nothing scheduled yet, this run will loop
looper->run();
evb.loopOnce();
EXPECT_EQ(0, pacingRunCounter);
EXPECT_EQ(1, loopCallbackRunCounter);
EXPECT_EQ(0U, pacingRunCounter);
EXPECT_EQ(1U, loopCallbackRunCounter);

// run() inside runFunc didn't have effect. Loop again won't run anything:
evb.loopOnce();
EXPECT_EQ(0, pacingRunCounter);
EXPECT_EQ(1, loopCallbackRunCounter);
EXPECT_EQ(0U, pacingRunCounter);
EXPECT_EQ(1U, loopCallbackRunCounter);

// Since pacing is scheduled, explicit run() outside of runFunc won't run
// either:
looper->run();
evb.loopOnce();
EXPECT_EQ(0, pacingRunCounter);
EXPECT_EQ(1, loopCallbackRunCounter);
EXPECT_EQ(0U, pacingRunCounter);
EXPECT_EQ(1U, loopCallbackRunCounter);

looper->stop();
}
Expand Down
28 changes: 14 additions & 14 deletions quic/common/test/IntervalSetTest.cpp
View file
Expand Up @@ -174,7 +174,7 @@ TEST(IntervalSet, withdrawBeforeFront) {
IntervalSet<int> set;
set.insert(4, 5);
set.withdraw({1, 2});
EXPECT_EQ(1, set.size());
EXPECT_EQ(1UL, set.size());
auto interval = set.front();
EXPECT_EQ(interval, Interval<int>(4, 5));
}
Expand All @@ -183,7 +183,7 @@ TEST(IntervalSet, withdrawAfterBack) {
IntervalSet<int> set;
set.insert(1, 2);
set.withdraw({4, 5});
EXPECT_EQ(1, set.size());
EXPECT_EQ(1UL, set.size());
auto interval = set.front();
EXPECT_EQ(interval, Interval<int>(1, 2));
}
Expand All @@ -193,7 +193,7 @@ TEST(IntervalSet, withdrawMiddleNoIntersection) {
set.insert(1, 2);
set.insert(7, 8);
set.withdraw({4, 5});
EXPECT_EQ(2, set.size());
EXPECT_EQ(2UL, set.size());
auto itr = set.cbegin();
EXPECT_EQ(*itr, Interval<int>(1, 2));
EXPECT_EQ(*++itr, Interval<int>(7, 8));
Expand All @@ -204,7 +204,7 @@ TEST(IntervalSet, withdrawMiddleLeftIntersection1) {
set.insert(1, 3);
set.insert(7, 8);
set.withdraw({3, 5});
EXPECT_EQ(2, set.size());
EXPECT_EQ(2UL, set.size());
auto itr = set.cbegin();
EXPECT_EQ(*itr, Interval<int>(1, 2));
EXPECT_EQ(*++itr, Interval<int>(7, 8));
Expand All @@ -215,7 +215,7 @@ TEST(IntervalSet, withdrawMiddleLeftIntersection2) {
set.insert(2, 3);
set.insert(7, 8);
set.withdraw({1, 5});
EXPECT_EQ(1, set.size());
EXPECT_EQ(1UL, set.size());
auto itr = set.cbegin();
EXPECT_EQ(*itr, Interval<int>(7, 8));
}
Expand All @@ -225,7 +225,7 @@ TEST(IntervalSet, withdrawMiddleRightIntersection1) {
set.insert(1, 2);
set.insert(5, 8);
set.withdraw({4, 6});
EXPECT_EQ(2, set.size());
EXPECT_EQ(2UL, set.size());
auto itr = set.cbegin();
EXPECT_EQ(*itr, Interval<int>(1, 2));
EXPECT_EQ(*++itr, Interval<int>(7, 8));
Expand All @@ -236,7 +236,7 @@ TEST(IntervalSet, withdrawMiddleRightIntersection2) {
set.insert(1, 2);
set.insert(5, 6);
set.withdraw({4, 6});
EXPECT_EQ(1, set.size());
EXPECT_EQ(1UL, set.size());
auto itr = set.cbegin();
EXPECT_EQ(*itr, Interval<int>(1, 2));
}
Expand All @@ -246,7 +246,7 @@ TEST(IntervalSet, withdrawMiddleBothIntersection1) {
set.insert(1, 3);
set.insert(5, 8);
set.withdraw({3, 6});
EXPECT_EQ(2, set.size());
EXPECT_EQ(2UL, set.size());
auto itr = set.cbegin();
EXPECT_EQ(*itr, Interval<int>(1, 2));
EXPECT_EQ(*++itr, Interval<int>(7, 8));
Expand All @@ -257,7 +257,7 @@ TEST(IntervalSet, withdrawMiddleBothIntersection2) {
set.insert(1, 3);
set.insert(5, 8);
set.withdraw({1, 10});
EXPECT_EQ(0, set.size());
EXPECT_EQ(0UL, set.size());
}

TEST(IntervalSet, withdrawMultipleIntersection) {
Expand All @@ -267,7 +267,7 @@ TEST(IntervalSet, withdrawMultipleIntersection) {
set.insert(10, 12);
set.insert(14, 18);
set.withdraw({3, 18});
EXPECT_EQ(1, set.size());
EXPECT_EQ(1UL, set.size());
auto itr = set.cbegin();
EXPECT_EQ(*itr, Interval<int>(1, 2));
}
Expand All @@ -276,7 +276,7 @@ TEST(IntervalSet, withdrawSubinterval) {
IntervalSet<int> set;
set.insert(1, 5);
set.withdraw({2, 2});
EXPECT_EQ(2, set.size());
EXPECT_EQ(2UL, set.size());
auto itr = set.cbegin();
EXPECT_EQ(*itr, Interval<int>(1, 1));
EXPECT_EQ(*++itr, Interval<int>(3, 5));
Expand All @@ -286,11 +286,11 @@ TEST(IntervalSet, withdrawSubintervalOnEdge) {
IntervalSet<int> set;
set.insert(1, 5);
set.withdraw({1, 1});
EXPECT_EQ(1, set.size());
EXPECT_EQ(1UL, set.size());
auto itr = set.cbegin();
EXPECT_EQ(*itr, Interval<int>(2, 5));
set.withdraw({4, 5});
EXPECT_EQ(1, set.size());
EXPECT_EQ(1UL, set.size());
itr = set.cbegin();
EXPECT_EQ(*itr, Interval<int>(2, 3));
}
Expand All @@ -299,7 +299,7 @@ TEST(IntervalSet, withdrawWithOverflow) {
IntervalSet<int> set;
set.insert(0, 5);
set.withdraw({0, 2});
EXPECT_EQ(1, set.size());
EXPECT_EQ(1UL, set.size());
auto interval = set.front();
EXPECT_EQ(interval, Interval<int>(3, 5));
}
8 changes: 4 additions & 4 deletions quic/handshake/test/TransportParametersTest.cpp
View file
Expand Up @@ -30,7 +30,7 @@ TEST_F(ExtensionsTest, TestClientParams) {
auto exts = getExtensions(clientParams);
auto ext = getExtension<ClientTransportParameters>(exts);
EXPECT_EQ(ext->initial_version, MVFST2);
EXPECT_EQ(ext->parameters.size(), 1);
EXPECT_EQ(ext->parameters.size(), 1UL);
EXPECT_EQ(
ext->parameters[0].parameter, TransportParameterId::initial_max_data);
EXPECT_EQ(
Expand All @@ -45,10 +45,10 @@ TEST_F(ExtensionsTest, TestServerParams) {
auto ext = getExtension<ServerTransportParameters>(exts);

EXPECT_EQ(ext->negotiated_version, MVFST2);
EXPECT_EQ(ext->supported_versions.size(), 2);
EXPECT_EQ(ext->supported_versions.size(), 2UL);
EXPECT_EQ(ext->supported_versions[0], MVFST1);
EXPECT_EQ(ext->supported_versions[1], MVFST2);
EXPECT_EQ(ext->parameters.size(), 1);
EXPECT_EQ(ext->parameters.size(), 1UL);
EXPECT_EQ(
ext->parameters[0].parameter, TransportParameterId::initial_max_data);
EXPECT_EQ(
Expand All @@ -63,7 +63,7 @@ TEST_F(ExtensionsTest, TestTicketParams) {
auto ext = getExtension<TicketTransportParameters>(exts);

EXPECT_EQ(ext->negotiated_version, MVFST2);
EXPECT_EQ(ext->parameters.size(), 1);
EXPECT_EQ(ext->parameters.size(), 1UL);
EXPECT_EQ(
ext->parameters[0].parameter, TransportParameterId::initial_max_data);
EXPECT_EQ(
Expand Down
4 changes: 2 additions & 2 deletions quic/server/handshake/test/AppTokenTest.cpp
View file
Expand Up @@ -38,7 +38,7 @@ void expectAppTokenEqual(
decodedAppToken->transportParams.parameters.size(),
appToken.transportParams.parameters.size());

EXPECT_EQ(decodedAppToken->transportParams.parameters.size(), 7);
EXPECT_EQ(decodedAppToken->transportParams.parameters.size(), 7UL);
// TODO Split out into individual flow control parameters.
auto maxStreamData = getIntegerParameter(
TransportParameterId::initial_max_stream_data_bidi_local,
Expand Down Expand Up @@ -91,7 +91,7 @@ void expectAppTokenEqual(
EXPECT_TRUE(folly::IOBufEqualTo()(
*decodedAppToken->appParams, *appToken.appParams));
} else {
EXPECT_EQ(decodedAppToken->appParams->computeChainDataLength(), 0);
EXPECT_EQ(decodedAppToken->appParams->computeChainDataLength(), 0UL);
}
}

Expand Down
2 changes: 1 addition & 1 deletion quic/server/handshake/test/ServerHandshakeTest.cpp
View file
Expand Up @@ -631,7 +631,7 @@ TEST_F(ServerHandshakeAsyncTest, TestAsyncCancel) {
promise.setValue();
evb.loop();

EXPECT_EQ(handshake->getDestructorGuardCount(), 0);
EXPECT_EQ(handshake->getDestructorGuardCount(), 0U);
}

class ServerHandshakeAsyncErrorTest : public ServerHandshakePskTest {
Expand Down
2 changes: 1 addition & 1 deletion quic/server/handshake/test/ServerTransportParametersTest.cpp
View file
Expand Up @@ -47,7 +47,7 @@ TEST(ServerTransportParametersTest, TestGetExtensions) {
kDefaultPartialReliability);
auto extensions = ext.getExtensions(getClientHello());

EXPECT_EQ(extensions.size(), 1);
EXPECT_EQ(extensions.size(), 1UL);
auto serverParams = getExtension<ServerTransportParameters>(extensions);
EXPECT_TRUE(serverParams.hasValue());
}
Expand Down

0 comments on commit 8a48198

Please sign in to comment.