Apply suggestions from code review

Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
python · corona10 · Aug 1, 2023 · Aug 16, 2021 · Jul 18, 2023 · Jul 21, 2023
commit 1ceea518ef709131c0ff99ef8ef3521f2336a4e6
diff --git a/Misc/NEWS.d/next/Library/2021-08-16-17-52-26.bpo-44850.r8jx5u.rst b/Misc/NEWS.d/next/Library/2021-08-16-17-52-26.bpo-44850.r8jx5u.rst
@@ -1 +1,2 @@
-Improve performance of ``operator.methodcaller`` by use of the the vectorcall protocol. Patch by Anthony Lee and Pieter Eendebak.
+Improve performance of :func:`operator.methodcaller` using the :pep:`590` ``vectorcall`` convention.
+Patch by Anthony Lee and Pieter Eendebak.
diff --git a/Modules/_operator.c b/Modules/_operator.c
@@ -1556,7 +1556,7 @@ typedef struct {
     vectorcallfunc vectorcall;
 } methodcallerobject;
 
-static void * _methodcaller_initialize_vectorcall(methodcallerobject* mc)
+static int _methodcaller_initialize_vectorcall(methodcallerobject* mc)
 {
     PyObject* args = mc->xargs;
     PyObject* kwds = mc->kwds;
@@ -1599,8 +1599,8 @@ static void _methodcaller_clear_vectorcall(methodcallerobject* mc)
     if (mc->vectorcall_args != NULL) {
         PyMem_Free(mc->vectorcall_args);
         mc->vectorcall_args = 0;
-        Py_CLEAR(mc->vectorcall_kwnames);
     }
+    Py_CLEAR(mc->vectorcall_kwnames);
 }
 
 static PyObject *
@@ -1632,7 +1632,7 @@ static PyObject *
 methodcaller_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
     methodcallerobject *mc;
-    PyObject* name;
+    PyObject *name;
 
     if (PyTuple_GET_SIZE(args) < 1) {
         PyErr_SetString(PyExc_TypeError, "methodcaller needs at least "
@@ -1807,7 +1807,7 @@ methodcaller_reduce(methodcallerobject *mc, PyObject *Py_UNUSED(ignored))
     if (!mc->kwds || PyDict_GET_SIZE(mc->kwds) == 0) {
         Py_ssize_t i;
         Py_ssize_t newarg_size = PyTuple_GET_SIZE(mc->xargs);
-        PyObject * newargs = PyTuple_New(newarg_size);
+        PyObject *newargs = PyTuple_New(newarg_size);
         if (newargs == NULL)
             return NULL;
         PyTuple_SET_ITEM(newargs, 0, Py_NewRef(mc->name));