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

amaury.forgeotdarc · amaury.forgeotdarc · commit 378f30fed19f · 2008-04-14T20:07:48.000Z
Some other minor updates in _warnings.c: - make a function static - rename a shadowing local variable git-svn-id: http://svn.python.org/projects/python/trunk@62341 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git 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;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ get_warnings_attr(const char *attr)`
`61`	`61`	`}`
`62`	`62`
`63`	`63`
`64`		`-PyObject *`
	`64`	`+static PyObject *`
`65`	`65`	`get_once_registry(void)`
`66`	`66`	`{`
`67`	`67`	`PyObject *registry;`
`@@ -378,16 +378,17 @@ warn_explicit(PyObject category, PyObject message,`
`378`	`378`	`show_warning(filename, lineno, text, category, sourceline);`
`379`	`379`	`}`
`380`	`380`	`else {`
`381`		`- PyObject *result;`
	`381`	`+ PyObject *res;`
`382`	`382`
`383`		`- result = PyObject_CallFunctionObjArgs(show_fxn, message, category,`
	`383`	`+ res = PyObject_CallFunctionObjArgs(show_fxn, message, category,`
`384`	`384`	`filename, lineno_obj,`
`385`	`385`	`Py_None,`
`386`	`386`	`sourceline ?`
`387`	`387`	`sourceline: Py_None,`
`388`	`388`	`NULL);`
`389`		`- Py_XDECREF(result);`
`390`		`- if (result == NULL)`
	`389`	`+ Py_DECREF(show_fxn);`
	`390`	`+ Py_XDECREF(res);`
	`391`	`+ if (res == NULL)`
`391`	`392`	`goto cleanup;`
`392`	`393`	`}`
`393`	`394`	`}`