summaryrefslogtreecommitdiffstats
path: root/Python/pathconfig.c
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2019-09-28 02:28:35 (GMT)
committerGitHub <noreply@github.com>2019-09-28 02:28:35 (GMT)
commit441b10cf2855955c86565f8d59e72c2efc0f0a57 (patch)
treeba45fe16778b945069b5fa425ed769075171f95c /Python/pathconfig.c
parent52d1b86bde2b772a76919c76991c326384954bf1 (diff)
downloadcpython-441b10cf2855955c86565f8d59e72c2efc0f0a57.zip
cpython-441b10cf2855955c86565f8d59e72c2efc0f0a57.tar.gz
cpython-441b10cf2855955c86565f8d59e72c2efc0f0a57.tar.bz2
bpo-38304: Add PyConfig.struct_size (GH-16451)
Add a new struct_size field to PyPreConfig and PyConfig structures to allow to modify these structures in the future without breaking the backward compatibility. * Replace private _config_version field with public struct_size field in PyPreConfig and PyConfig. * Public PyPreConfig_InitIsolatedConfig() and PyPreConfig_InitPythonConfig() return type becomes PyStatus, instead of void. * Internal _PyConfig_InitCompatConfig(), _PyPreConfig_InitCompatConfig(), _PyPreConfig_InitFromConfig(), _PyPreConfig_InitFromPreConfig() return type becomes PyStatus, instead of void. * Remove _Py_CONFIG_VERSION * Update the Initialization Configuration documentation.
Diffstat (limited to 'Python/pathconfig.c')
-rw-r--r--Python/pathconfig.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/Python/pathconfig.c b/Python/pathconfig.c
index 8126145..6886ab7 100644
--- a/Python/pathconfig.c
+++ b/Python/pathconfig.c
@@ -434,7 +434,12 @@ pathconfig_global_read(_PyPathConfig *pathconfig)
{
PyStatus status;
PyConfig config;
- _PyConfig_InitCompatConfig(&config);
+ config.struct_size = sizeof(PyConfig);
+
+ status = _PyConfig_InitCompatConfig(&config);
+ if (_PyStatus_EXCEPTION(status)) {
+ goto done;
+ }
/* Call _PyConfig_InitPathConfig() */
status = PyConfig_Read(&config);