Skip to content
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.

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

lib: avoid fallthrough cases in switch statements #7322

Conversation

@danielgustafsson
Copy link
Member

@danielgustafsson danielgustafsson commented Jun 30, 2021

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

lib/http_ntlm.c Outdated
@@ -198,6 +198,12 @@ CURLcode Curl_output_ntlm(struct Curl_easy *data, bool proxy)
#endif

Curl_bufref_init(&ntlmmsg);

/* connection is already authenticated, don't send a header in future
* requests so do directly to NTLMSTATE_LAST */
Copy link
Member

@bagder bagder Jul 1, 2021

go directly?

bagder
bagder approved these changes Jul 1, 2021
Copy link
Member

@bagder bagder left a comment

Most, if not all, of these changes seem to also improve code readability!

@danielgustafsson
Copy link
Member Author

@danielgustafsson danielgustafsson commented Jul 1, 2021

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
@bagder
Copy link
Member

@bagder bagder commented Sep 27, 2021

@danielgustafsson how do you feel about this now. Ready to merge?

@danielgustafsson
Copy link
Member Author

@danielgustafsson danielgustafsson commented Sep 27, 2021

@danielgustafsson danielgustafsson force-pushed the dg-fallthrough_avoidance branch from 29a97f0 to cd05efa Sep 28, 2021
@bagder
Copy link
Member

@bagder bagder commented Sep 28, 2021

The CI failures seem unrelated to this PR.

@danielgustafsson
Copy link
Member Author

@danielgustafsson danielgustafsson commented Sep 29, 2021

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants