diff options
author | Victor Stinner <vstinner@redhat.com> | 2019-05-17 13:20:52 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-17 13:20:52 (GMT) |
commit | b16b4e45923f4e4dfd8e970ae4e6a934faf73b79 (patch) | |
tree | fb7b3abc251f148386efdad7a5cde5d13d157d38 /Python/coreconfig.c | |
parent | 80ed353329ef01ca6ab2056051fb999818a86215 (diff) | |
download | cpython-b16b4e45923f4e4dfd8e970ae4e6a934faf73b79.zip cpython-b16b4e45923f4e4dfd8e970ae4e6a934faf73b79.tar.gz cpython-b16b4e45923f4e4dfd8e970ae4e6a934faf73b79.tar.bz2 |
bpo-36763: Add PyMemAllocatorName (GH-13387)
* Add PyMemAllocatorName enum
* _PyPreConfig.allocator type becomes PyMemAllocatorName, instead of
char*
* Remove _PyPreConfig_Clear()
* Add _PyMem_GetAllocatorName()
* Rename _PyMem_GetAllocatorsName() to
_PyMem_GetCurrentAllocatorName()
* Remove _PyPreConfig_SetAllocator(): just call
_PyMem_SetupAllocators() directly, we don't have do reallocate the
configuration with the new allocator anymore!
* _PyPreConfig_Write() parameter becomes const, as it should be in
the first place!
Diffstat (limited to 'Python/coreconfig.c')
-rw-r--r-- | Python/coreconfig.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Python/coreconfig.c b/Python/coreconfig.c index c20ae21..634891e 100644 --- a/Python/coreconfig.c +++ b/Python/coreconfig.c @@ -2021,26 +2021,22 @@ core_read_precmdline(_PyCoreConfig *config, _PyPreCmdline *precmdline) _PyPreConfig preconfig = _PyPreConfig_INIT; if (_PyPreConfig_Copy(&preconfig, &_PyRuntime.preconfig) < 0) { err = _Py_INIT_NO_MEMORY(); - goto done; + return err; } _PyCoreConfig_GetCoreConfig(&preconfig, config); err = _PyPreCmdline_Read(precmdline, &preconfig); if (_Py_INIT_FAILED(err)) { - goto done; + return err; } if (_PyPreCmdline_SetCoreConfig(precmdline, config) < 0) { err = _Py_INIT_NO_MEMORY(); - goto done; + return err; } - err = _Py_INIT_OK(); - -done: - _PyPreConfig_Clear(&preconfig); - return err; + return _Py_INIT_OK(); } |