[Python-checkins] r62341 - python/trunk/Python/_warnings.c

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Mon Apr 14 22:07:48 2008
New Revision: 62341

Log:
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


Modified:
   python/trunk/Python/_warnings.c

Modified: python/trunk/Python/_warnings.c
==============================================================================
--- python/trunk/Python/_warnings.c	(original)
+++ python/trunk/Python/_warnings.c	Mon Apr 14 22:07:48 2008
@@ -61,7 +61,7 @@
 }
 
 
-PyObject *
+static PyObject *
 get_once_registry(void)
 {
     PyObject *registry;
@@ -378,16 +378,17 @@
             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;
         }
     }