Skip to content

Windows compilation: ensure statusCodeToString has no control paths that do not return #10777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 3 commits into from
Apr 15, 2020
+3 −2
Merged

Windows compilation: ensure statusCodeToString has no control paths that do not return #10777

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f6f59e
Add assertion that status code is not invalid
sunjayBhatia Apr 14, 2020
43c8533
Replace RELEASE_ASSERT with NOT_REACHED_GCOVR_EXCL_LINE
wrowe Apr 15, 2020
e16cbdc
Move NOT_REACHED_GCOVR_EXCL_LINE outside switch
sunjayBhatia Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions source/common/http/status.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ absl::string_view statusCodeToString(StatusCode code) {
return "PrematureResponseError";
case StatusCode::CodecClientError:
return "CodecClientError";
default:
Comment thread
sunjayBhatia marked this conversation as resolved.
Outdated
NOT_REACHED_GCOVR_EXCL_LINE;
}
}

Expand Down
4 changes: 2 additions & 2 deletions source/common/http/status.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Status codecClientError(absl::string_view message);

/**
* Returns Envoy::StatusCode of the given status object.
* If the status object does not contain valid Envoy::Status value the function will RELEASE_ASSERT.
* If the status object does not contain valid Envoy::Status value the function will ASSERT.
*/
StatusCode getStatusCode(const Status& status);

Expand All @@ -105,7 +105,7 @@ ABSL_MUST_USE_RESULT bool isCodecClientError(const Status& status);

/**
* Returns Http::Code value of the PrematureResponseError status.
* IsPrematureResponseError(status) must be true which is checked by RELEASE_ASSERT.
* IsPrematureResponseError(status) must be true which is checked by ASSERT.
*/
Http::Code getPrematureResponseHttpCode(const Status& status);

Expand Down