From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Mon, 14 Apr 2008 20:07:48 +0000 (+0000)
Subject: Correct a refleak found by "regrtest.py -R:: test_structmembers"
X-Git-Tag: v2.6a3~187
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9e7ebe165215c8eadd16c7988c5d20c0d114cf5;p=python

Correct a refleak found by "regrtest.py -R:: test_structmembers"

Some other minor updates in _warnings.c:
- make a function static
- rename a shadowing local variable
---

diff --git a/Python/_warnings.c b/Python/_warnings.c
index dc333439b3..bb688b1be0 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -61,7 +61,7 @@ get_warnings_attr(const char *attr)
 }
 
 
-PyObject *
+static PyObject *
 get_once_registry(void)
 {
     PyObject *registry;
@@ -378,16 +378,17 @@ warn_explicit(PyObject *category, PyObject *message,
             show_warning(filename, lineno, text, category, sourceline);
         }
         else {
-            PyObject *result;
+            PyObject *res;
             
-            result = PyObject_CallFunctionObjArgs(show_fxn, message, category,
+            res = PyObject_CallFunctionObjArgs(show_fxn, message, category,
                                                     filename, lineno_obj,
                                                     Py_None,
                                                     sourceline ?
                                                         sourceline: Py_None,
                                                     NULL);
-            Py_XDECREF(result);
-            if (result == NULL)
+            Py_DECREF(show_fxn);
+            Py_XDECREF(res);
+            if (res == NULL)
                 goto cleanup;
         }
     }