closes bpo-45479: Degunkify Py_UniversalNewlineFgets. #28965
Merged
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
benjaminp
changed the title
Remove dead variables and control flow.
eryksun
reviewed
Oct 15, 2021
| while (--n > 0 && (c = GETC(stream)) != EOF ) { | ||
| if (skipnextlf ) { | ||
| if (skipnextlf) { |
There was a problem hiding this comment.
This block never executes. skipnextlf is only set if c == '\r' in the next block, in which case c is set to '\n', and the execution flow breaks out of the loop via if (c == '\n') break. The value of skipnextlf is handled after the loop. The loop can be simplified as follows:
while (--n > 0 && (c = GETC(stream)) != EOF) {
if (c == '\r') {
/* Translate \r to \n, and skip an adjacent \n, if any. */
skipnextlf = 1;
c = '\n';
}
*p++ = c;
if (c == '\n') {
break;
}
}
benjaminp
added a commit
that referenced
this pull request
Oct 15, 2021
Thank you to Eryk Sun for the suggestions in #28965 (comment).
ShivnarenSrinivasan
pushed a commit
to ShivnarenSrinivasan/cpython
that referenced
this pull request
Oct 15, 2021
Remove dead variables and control flow.
ShivnarenSrinivasan
pushed a commit
to ShivnarenSrinivasan/cpython
that referenced
this pull request
Oct 15, 2021
Thank you to Eryk Sun for the suggestions in python#28965 (comment).
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.
Remove dead variables and control flow.
https://bugs.python.org/issue45479