openssl: remove bad gotos into other scope
#16356
Closed
Conversation
This file contains 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
MarcelRaad
added a commit
to MarcelRaad/curl
that referenced
this pull request
Feb 16, 2025
All the `goto` did in these cases was effectively `return 0`, so just use that explicitly. Closes curl#16356
MarcelRaad
force-pushed
the
remove_bad_goto
branch
from
6ba2545 to
49b9576
Compare
vszakats
reviewed
Feb 16, 2025
lib/vtls/openssl.c
Outdated
Comment on lines
1523
to
1524
| if(!PKCS12_parse(p12, key_passwd, &pri, &x509, | ||
| &ca)) { |
There was a problem hiding this comment.
Suggested change
| if(!PKCS12_parse(p12, key_passwd, &pri, &x509, | |
| &ca)) { | |
| if(!PKCS12_parse(p12, key_passwd, &pri, &x509, &ca)) { |
keep original line here? [nit]
There was a problem hiding this comment.
Ah, I just reverted the whole commit 3f79695. I can keep its formatting changes. Should I still leave git's default revert commit message untouched in this case?
There was a problem hiding this comment.
I think that's fine, if you make a separate sub-commit to amend it. However you feel it's best, it's also fine to leave it as-is.
There was a problem hiding this comment.
OK thanks! I did that first, but the double-revert looked strange to me and therefore I amended the commit message instead.
This reverts the main part of commit 3f79695, but keeping the formatting fix. Closes curl#16356
All the `goto` did in these cases was effectively `return 0`, so just use that explicitly. Closes curl#16356
MarcelRaad
force-pushed
the
remove_bad_goto
branch
from
49b9576 to
7a51d08
Compare
MarcelRaad
added a commit
to MarcelRaad/curl
that referenced
this pull request
Feb 17, 2025
This reverts the main part of commit 3f79695, but keeping the formatting fix. Closes curl#16356
MarcelRaad
added a commit
to MarcelRaad/curl
that referenced
this pull request
Feb 17, 2025
All the `goto` did in these cases was effectively `return 0`, so just use that explicitly. Closes curl#16356
MarcelRaad
added a commit
to MarcelRaad/curl
that referenced
this pull request
Feb 17, 2025
All the `goto` did in these cases was effectively `return 0`, so just use that explicitly. Closes curl#16356
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
All the
gotodid in these cases was effectivelyreturn 0, so justuse that explicitly.
This avoids GCC warnings in addition to the MSVC warning.