lib: avoid fallthrough cases in switch statements#7322
Closed
danielgustafsson wants to merge 1 commit intocurl:masterfrom
Closed
lib: avoid fallthrough cases in switch statements#7322danielgustafsson wants to merge 1 commit intocurl:masterfrom
danielgustafsson wants to merge 1 commit intocurl:masterfrom
Conversation
bagder
reviewed
Jul 1, 2021
lib/http_ntlm.c
Outdated
bagder
approved these changes
Jul 1, 2021
Member
bagder
left a comment
bagder
left a comment
There was a problem hiding this comment.
Most, if not all, of these changes seem to also improve code readability!
Member
Author
|
On 1 Jul 2021, at 10:38, Daniel Stenberg ***@***.***> wrote:
Curl_bufref_init(&ntlmmsg);
+
+ /* connection is already authenticated, don't send a header in future
+ * requests so do directly to NTLMSTATE_LAST */
go directly?
Doh, yes of course, will fix.
|
danielgustafsson
added
the
feature-window
danielgustafsson
force-pushed
the
dg-fallthrough_avoidance
branch
from
0126e0f to
29a97f0
Compare
Commit b5a434f inhibits the warning on implicit fallthrough cases, since the current coding of indicating fallthrough with comments is falling out of fashion with new compilers. This attempts to make the issue smaller by rewriting fallthroughs to no longer fallthrough, via either breaking the cases or turning switch statements into if statements. lib/content_encoding.c: the fallthrough codepath is simply copied into the case as it's a single line. lib/http_ntlm.c: the fallthrough case skips a state in the state- machine and fast-forwards to NTLMSTATE_LAST. Do this before the switch statement instead to set up the states that we actually want. lib/http_proxy.c: the fallthrough is just falling into exiting the switch statement which can be done easily enough in the case. lib/mime.c: switch statement rewritten as if statement. lib/pop3.c: the fallthrough case skips to the next state in the statemachine, do this explicitly instead. lib/urlapi.c: switch statement rewritten as if statement. lib/vssh/wolfssh.c: the fallthrough cases fast-forwards the state machine, do this by running another iteration of the switch statement instead. lib/vtls/gtls.c: switch statement rewritten as if statement. lib/vtls/nss.c: the fallthrough codepath is simply copied into the case as it's a single line. Also twiddle a comment to not be inside a non-brace if statement. Closes: #xxxx See-also: curl#7295
Member
|
@danielgustafsson how do you feel about this now. Ready to merge? |
Member
Author
|
@danielgustafsson how do you feel about this now. Ready to merge?
Yes, I intend to get this in during the feature window for 7.80
|
danielgustafsson
force-pushed
the
dg-fallthrough_avoidance
branch
from
29a97f0 to
cd05efa
Compare
Member
|
The CI failures seem unrelated to this PR. |
Member
Author
|
The CI failures seem unrelated to this PR.
Thanks for clarifying, I've pushed this to master now.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This patch needs a lot of exercise on the CI courts, it should be a noop functionality wise.
Commit b5a434f inhibits the warning
on implicit fallthrough cases, since the current coding of indicating
fallthrough with comments is falling out of fashion with new compilers.
This attempts to make the issue smaller by rewriting fallthroughs to no
longer fallthrough, via either breaking the cases or turning switch
statements into if statements.
lib/content_encoding.c: the fallthrough codepath is simply copied
into the case as it's a single line.
lib/http_ntlm.c: the fallthrough case skips a state in the state-
machine and fast-forwards to NTLMSTATE_LAST. Do this before the
switch statement instead to set up the states that we actually
want.
lib/http_proxy.c: the fallthrough is just falling into exiting the
switch statement which can be done easily enough in the case.
lib/mime.c: switch statement rewritten as if statement.
lib/pop3.c: the fallthrough case skips to the next state in the
statemachine, do this explicitly instead.
lib/urlapi.c: switch statement rewritten as if statement.
lib/vssh/wolfssh.c: the fallthrough cases fast-forwards the state
machine, do this by running another iteration of the switch
statement instead.
lib/vtls/gtls.c: switch statement rewritten as if statement.
lib/vtls/nss.c: the fallthrough codepath is simply copied into the
case as it's a single line. Also twiddle a comment to not be
inside a non-brace if statement.
Closes: #xxxx
See-also: #7295