diff options
author | Victor Stinner <vstinner@python.org> | 2020-06-16 01:28:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-16 01:28:07 +0200 |
commit | 04fc4f2a46b2fd083639deb872c3a3037fdb47d6 (patch) | |
tree | 3fc5a585683e09748fb3113c34cfa42e8bf634b2 /Modules/gcmodule.c | |
parent | 7ab92d54b5d4440d84f6c02b4bc5a70103eff915 (diff) | |
download | cpython-git-04fc4f2a46b2fd083639deb872c3a3037fdb47d6.tar.gz |
bpo-40989: PyObject_INIT() becomes an alias to PyObject_Init() (GH-20901)
The PyObject_INIT() and PyObject_INIT_VAR() macros become aliases to,
respectively, PyObject_Init() and PyObject_InitVar() functions.
Rename _PyObject_INIT() and _PyObject_INIT_VAR() static inline
functions to, respectively, _PyObject_Init() and _PyObject_InitVar(),
and move them to pycore_object.h. Remove their return value:
their return type becomes void.
The _datetime module is now built with the Py_BUILD_CORE_MODULE macro
defined.
Remove an outdated comment on _Py_tracemalloc_config.
Diffstat (limited to 'Modules/gcmodule.c')
-rw-r--r-- | Modules/gcmodule.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index 444db7b03b..110a48d8cd 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -2263,8 +2263,10 @@ PyObject * _PyObject_GC_New(PyTypeObject *tp) { PyObject *op = _PyObject_GC_Malloc(_PyObject_SIZE(tp)); - if (op != NULL) - op = PyObject_INIT(op, tp); + if (op == NULL) { + return NULL; + } + _PyObject_Init(op, tp); return op; } @@ -2280,8 +2282,10 @@ _PyObject_GC_NewVar(PyTypeObject *tp, Py_ssize_t nitems) } size = _PyObject_VAR_SIZE(tp, nitems); op = (PyVarObject *) _PyObject_GC_Malloc(size); - if (op != NULL) - op = PyObject_INIT_VAR(op, tp, nitems); + if (op == NULL) { + return NULL; + } + _PyObject_InitVar(op, tp, nitems); return op; } |