Rename NO_ERROR to BALSA_NO_ERROR. Rename BalsaFrameEnums::ErrorCode::NO_ERROR, because NO_ERROR is an existing macro on Windows, so the current code does not compile. PiperOrigin-RevId: 450518180
diff --git a/quiche/balsa/balsa_enums.cc b/quiche/balsa/balsa_enums.cc index d9c1dfd..6714fda 100644 --- a/quiche/balsa/balsa_enums.cc +++ b/quiche/balsa/balsa_enums.cc
@@ -40,8 +40,8 @@ const char* BalsaFrameEnums::ErrorCodeToString( BalsaFrameEnums::ErrorCode error_code) { switch (error_code) { - case NO_ERROR: - return "NO_ERROR"; + case BALSA_NO_ERROR: + return "BALSA_NO_ERROR"; case NO_STATUS_LINE_IN_RESPONSE: return "NO_STATUS_LINE_IN_RESPONSE"; case NO_REQUEST_LINE_IN_REQUEST:
diff --git a/quiche/balsa/balsa_enums.h b/quiche/balsa/balsa_enums.h index 9302881..34bfd4d 100644 --- a/quiche/balsa/balsa_enums.h +++ b/quiche/balsa/balsa_enums.h
@@ -28,7 +28,7 @@ enum ErrorCode : int { // A sentinel value for convenience, none of the callbacks should ever see // this error code. - NO_ERROR = 0, + BALSA_NO_ERROR = 0, // Header parsing errors // Note that adding one to many of the REQUEST errors yields the
diff --git a/quiche/balsa/balsa_frame.cc b/quiche/balsa/balsa_frame.cc index ebdc299..d80b4ba 100644 --- a/quiche/balsa/balsa_frame.cc +++ b/quiche/balsa/balsa_frame.cc
@@ -68,7 +68,7 @@ last_slash_n_idx_ = 0; term_chars_ = 0; parse_state_ = BalsaFrameEnums::READING_HEADER_AND_FIRSTLINE; - last_error_ = BalsaFrameEnums::NO_ERROR; + last_error_ = BalsaFrameEnums::BALSA_NO_ERROR; invalid_chars_.clear(); lines_.clear(); if (continue_headers_ != nullptr) { @@ -199,7 +199,7 @@ } } if (headers->whitespace_3_idx_ == headers->non_whitespace_3_idx_) { - if (*error_code == BalsaFrameEnums::NO_ERROR) { + if (*error_code == BalsaFrameEnums::BALSA_NO_ERROR) { // FAILED_TO_FIND_WS_AFTER_REQUEST_METHOD for request // FAILED_TO_FIND_WS_AFTER_RESPONSE_VERSION for response *error_code = static_cast<BalsaFrameEnums::ErrorCode>(
diff --git a/quiche/balsa/balsa_frame.h b/quiche/balsa/balsa_frame.h index 5b569ea..230bf66 100644 --- a/quiche/balsa/balsa_frame.h +++ b/quiche/balsa/balsa_frame.h
@@ -61,7 +61,7 @@ last_slash_n_idx_(0), term_chars_(0), parse_state_(BalsaFrameEnums::READING_HEADER_AND_FIRSTLINE), - last_error_(BalsaFrameEnums::NO_ERROR), + last_error_(BalsaFrameEnums::BALSA_NO_ERROR), continue_headers_(nullptr), headers_(nullptr), start_of_trailer_line_(0),
diff --git a/quiche/balsa/balsa_frame_test.cc b/quiche/balsa/balsa_frame_test.cc index bf3d2a3..ecf7454 100644 --- a/quiche/balsa/balsa_frame_test.cc +++ b/quiche/balsa/balsa_frame_test.cc
@@ -882,7 +882,7 @@ SCOPED_TRACE(EscapeString(message)); size_t bytes_consumed = framer.ProcessInput(message.data(), message.size()); EXPECT_EQ(message.size(), bytes_consumed); - if (expected_error_code == BalsaFrameEnums::NO_ERROR) { + if (expected_error_code == BalsaFrameEnums::BALSA_NO_ERROR) { EXPECT_EQ(false, framer.Error()); } else { EXPECT_EQ(true, framer.Error()); @@ -912,13 +912,13 @@ "test: test\r\n" " continued\r\n" "\r\n", - true, BalsaFrameEnums::NO_ERROR); + true, BalsaFrameEnums::BALSA_NO_ERROR); WhitespaceHeaderTestHelper( "GET / HTTP/1.1\r\n" "test: test\r\n" " \r\n" "\r\n", - true, BalsaFrameEnums::NO_ERROR); + true, BalsaFrameEnums::BALSA_NO_ERROR); } TEST(HTTPBalsaFrame, WhitespaceInResponsesProcessedProperly) { @@ -938,14 +938,14 @@ " continued\r\n" "Content-Length: 0\r\n" "\r\n", - false, BalsaFrameEnums::NO_ERROR); + false, BalsaFrameEnums::BALSA_NO_ERROR); WhitespaceHeaderTestHelper( "HTTP/1.0 200 Reason\r\n" "test: test\r\n" " \r\n" "Content-Length: 0\r\n" "\r\n", - false, BalsaFrameEnums::NO_ERROR); + false, BalsaFrameEnums::BALSA_NO_ERROR); } TEST_F(HTTPBalsaFrameTest, VisitorInvokedProperlyForTrivialRequest) { @@ -1196,7 +1196,7 @@ EXPECT_EQ(trailer.size(), balsa_frame_.ProcessInput(trailer.data(), trailer.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } TEST_F(HTTPBalsaFrameTest, NothingBadHappensWhenNoVisitorIsAssignedInResponse) { @@ -1225,7 +1225,7 @@ EXPECT_EQ(trailer.size(), balsa_frame_.ProcessInput(trailer.data(), trailer.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); const absl::string_view crass = trailer_.GetHeader("crass"); EXPECT_EQ("monkeys", crass); const absl::string_view funky = trailer_.GetHeader("funky"); @@ -1248,7 +1248,7 @@ EXPECT_FALSE(balsa_frame_.MessageFullyRead()); ASSERT_EQ(body.size(), balsa_frame_.ProcessInput(body.data(), body.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } TEST_F(HTTPBalsaFrameTest, @@ -1276,7 +1276,7 @@ ASSERT_EQ(trailer.size(), balsa_frame_.ProcessInput(trailer.data(), trailer.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } TEST_F(HTTPBalsaFrameTest, @@ -1307,7 +1307,7 @@ ASSERT_EQ(trailer.size(), balsa_frame_.ProcessInput(trailer.data(), trailer.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); const absl::string_view crass = trailer_.GetHeader("crass"); EXPECT_EQ("monkeys", crass); const absl::string_view funky = trailer_.GetHeader("funky"); @@ -1519,7 +1519,7 @@ message.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } TEST_F(HTTPBalsaFrameTest, @@ -1555,7 +1555,7 @@ message.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } TEST_F(HTTPBalsaFrameTest, @@ -1617,7 +1617,7 @@ message.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); EXPECT_EQ(message_body, body_input); EXPECT_EQ(message_body_data, body_data); @@ -1689,7 +1689,7 @@ message.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); EXPECT_EQ(message_body, body_input); EXPECT_EQ(message_body_data, body_data); @@ -1930,7 +1930,7 @@ balsa_frame_.ProcessInput(message.data(), message.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } TEST_F(HTTPBalsaFrameTest, @@ -1963,7 +1963,7 @@ header_input.data(), header_input.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } TEST_F(HTTPBalsaFrameTest, VisitorInvokedProperlyForResponseWithBlankLines) { @@ -1998,7 +1998,7 @@ balsa_frame_.ProcessInput(message.data(), message.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } TEST_F(HTTPBalsaFrameTest, VisitorInvokedProperlyForResponseWithContentLength) { @@ -2034,7 +2034,7 @@ message.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } TEST_F(HTTPBalsaFrameTest, @@ -2093,7 +2093,7 @@ message.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); EXPECT_EQ(message_body, body_input); EXPECT_EQ(message_body_data, body_data); @@ -2163,7 +2163,7 @@ message.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); EXPECT_EQ(message_body, body_input); EXPECT_EQ(message_body_data, body_data); @@ -2238,7 +2238,7 @@ } EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); EXPECT_EQ(message_body, body_input); EXPECT_EQ(message_body_data, body_data); @@ -2333,7 +2333,7 @@ EXPECT_EQ(message.size(), total_processed); EXPECT_TRUE(balsa_frame.MessageFullyRead()); EXPECT_FALSE(balsa_frame.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame.ErrorCode()); EXPECT_EQ(message_body, body_input); EXPECT_EQ(message_body_data, body_data); @@ -2880,10 +2880,10 @@ "\r\n" "1"; balsa_frame_.ProcessInput(header.data(), header.size()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); EXPECT_FALSE(balsa_frame_.Error()); balsa_frame_.ProcessInput(header.data(), header.size()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); EXPECT_FALSE(balsa_frame_.Error()); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); } @@ -3225,7 +3225,7 @@ trailer_data.data(), trailer_data.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); EXPECT_EQ(chunks, body_input); @@ -3263,7 +3263,7 @@ balsa_frame_.ProcessInput(trailer.data(), trailer.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } // Test Reset() correctly resets trailer related states. @@ -3293,7 +3293,7 @@ balsa_frame_.ProcessInput(trailer.data(), trailer.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); absl::string_view value = trailer_.GetHeader("k"); EXPECT_EQ("v", value); @@ -3321,7 +3321,7 @@ balsa_frame_.ProcessInput(trailer.data(), trailer.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); value = trailer_.GetHeader("k"); EXPECT_TRUE(value.empty()); @@ -3524,7 +3524,7 @@ balsa_frame_.ProcessInput(trailer.data(), trailer.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); // Transfer-encoding can be multi-valued, so GetHeader does not work. EXPECT_TRUE(headers_.transfer_encoding_is_chunked()); @@ -3612,7 +3612,7 @@ balsa_frame_.ProcessInput(trailer.data(), trailer.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } // Handle two sets of headers when set up properly and the first is 100 @@ -3640,7 +3640,7 @@ ASSERT_EQ(body.size(), balsa_frame_.ProcessInput(body.data(), body.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } // Handle two sets of headers when set up properly and the first is 100 @@ -3668,7 +3668,7 @@ ASSERT_EQ(body.size(), balsa_frame_.ProcessInput(body.data(), body.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } TEST_F(HTTPBalsaFrameTest, Support100ContinueRunTogether) { @@ -3697,7 +3697,7 @@ ASSERT_EQ(body.size(), balsa_frame_.ProcessInput(body.data(), body.size())); EXPECT_TRUE(balsa_frame_.MessageFullyRead()); EXPECT_FALSE(balsa_frame_.Error()); - EXPECT_EQ(BalsaFrameEnums::NO_ERROR, balsa_frame_.ErrorCode()); + EXPECT_EQ(BalsaFrameEnums::BALSA_NO_ERROR, balsa_frame_.ErrorCode()); } } // namespace