Skip to content

bpo-23878: Remove an unneeded fseek() call in _Py_FindEnvConfigValue()#15424

Merged
vstinner merged 3 commits into
python:masterfrom
ZackerySpytz:bpo-23878-fseek-sanity-check
Aug 28, 2019
Merged

bpo-23878: Remove an unneeded fseek() call in _Py_FindEnvConfigValue()#15424
vstinner merged 3 commits into
python:masterfrom
ZackerySpytz:bpo-23878-fseek-sanity-check

Conversation

@ZackerySpytz

@ZackerySpytz ZackerySpytz commented Aug 23, 2019

Copy link
Copy Markdown
Contributor

Comment thread Python/pathconfig.c
@@ -741,7 +741,9 @@ _Py_FindEnvConfigValue(FILE *env_file, const wchar_t *key,
char buffer[MAXPATHLEN * 2 + 1]; /* allow extra for key, '=', etc. */
buffer[Py_ARRAY_LENGTH(buffer)-1] = '\0';

@vstinner vstinner Aug 26, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update the function comment: explain that it returns 1 and copy it into value if found, or return 0 on error or if not found. Something like that.

I'm not sure why key is a parameter: its value is always "home". Maybe write a following PR to remove the key parameter? (need to update getpath.c and getpathp.c)

@vstinner vstinner Aug 26, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: I'm not sure why fseek(0) is called: we just opened the file in read mode, not in append mode, the file cursor should already be 0.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you very much for your review, @vstinner. I have removed the fseek() call -- it indeed seems to be unneeded.
I will create a pull request to remove the key parameter.

@ZackerySpytz ZackerySpytz changed the title bpo-23878: Check the fseek() call in _Py_FindEnvConfigValue() bpo-23878: Remove an unneeded fseek() call in _Py_FindEnvConfigValue() Aug 27, 2019
@vstinner vstinner merged commit e4a5e9b into python:master Aug 28, 2019
@vstinner

Copy link
Copy Markdown
Member

I don't think that it's worth it to backport this change to Python 3.7 or 3.8.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants