mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

bpo-32030: Fix compiler warnings (#4921)

Browse source 
Fix compiler warnings in Py_FinalizeEx(): only define variables if
they are needed, add #ifdef.

Other cleanup changes:

* _PyWarnings_InitWithConfig() is no more needed: call
  _PyWarnings_Init() instead.
* Inline pymain_init_main_interpreter() in its caller. This
  subfunction is no more justifed.
This commit is contained in:
Victor Stinner 2017-12-19 11:35:58 +01:00 • committed by GitHub
parent 21be85f520
commit 5d8624647d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Modules/main.c
View file

@ -1151,27 +1151,6 @@ pymain_get_program_name(_PyMain *pymain)
}
/* Initialize the main interpreter.
*
* Replaces previous call to Py_Initialize()
*
* Return 0 on success.
* Set pymain->err and return -1 on error.
*/
static int
pymain_init_main_interpreter(_PyMain *pymain)
{
_PyInitError err;
err = _Py_InitializeMainInterpreter(&pymain->config);
if (_Py_INIT_FAILED(err)) {
pymain->err = err;
return -1;
}
return 0;
}
static void
pymain_header(_PyMain *pymain)
{
@ -2357,7 +2336,9 @@ pymain_init_python_main(_PyMain *pymain)
return -1;
}
if (pymain_init_main_interpreter(pymain)) {
err = _Py_InitializeMainInterpreter(&pymain->config);
if (_Py_INIT_FAILED(err)) {
pymain->err = err;
return -1;
}