[Python-checkins] cpython (merge 3.3 -> default): Issue #17034: Use Py_CLEAR() in bytesobject.c.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/33bef5e211af
changeset:   81936:33bef5e211af
parent:      81927:25294188c4ea
parent:      81935:7e34c176aa6f
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sat Feb 02 18:46:19 2013 +0200
summary:
  Issue #17034: Use Py_CLEAR() in bytesobject.c.

files:
  Objects/bytesobject.c |  12 ++++--------
  1 files changed, 4 insertions(+), 8 deletions(-)


diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -2754,8 +2754,7 @@
     if (*pv == NULL)
         return;
     if (w == NULL) {
-        Py_DECREF(*pv);
-        *pv = NULL;
+        Py_CLEAR(*pv);
         return;
     }
     v = bytes_concat(*pv, w);
@@ -2819,12 +2818,9 @@
 PyBytes_Fini(void)
 {
     int i;
-    for (i = 0; i < UCHAR_MAX + 1; i++) {
-        Py_XDECREF(characters[i]);
-        characters[i] = NULL;
-    }
-    Py_XDECREF(nullstring);
-    nullstring = NULL;
+    for (i = 0; i < UCHAR_MAX + 1; i++)
+        Py_CLEAR(characters[i]);
+    Py_CLEAR(nullstring);
 }
 
 /*********************** Bytes Iterator ****************************/

-- 
Repository URL: http://hg.python.org/cpython