Mercurial > cpython-lru_cache-weakref

diff Objects/weakrefobject.c @ 81893:59acde449f8d 2.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Silence a -Wformat-extra-argument warning when compiling.
author Gregory P. Smith <greg@krypto.org>
date Fri, 01 Feb 2013 16:13:27 -0800
parents 7e771f0363e2
children
line wrap: on
line diff
--- a/Objects/weakrefobject.c	Fri Feb 01 13:58:00 2013 -0800
+++ b/Objects/weakrefobject.c	Fri Feb 01 16:13:27 2013 -0800
@@ -167,13 +167,21 @@
                 PyErr_Clear();
         else if (PyString_Check(nameobj))
                 name = PyString_AS_STRING(nameobj);
-        PyOS_snprintf(buffer, sizeof(buffer),
-                      name ? "<weakref at %p; to '%.50s' at %p (%s)>"
-                           : "<weakref at %p; to '%.50s' at %p>",
-                      self,
-                      Py_TYPE(PyWeakref_GET_OBJECT(self))->tp_name,
-                      PyWeakref_GET_OBJECT(self),
-                      name);
+        if (name != NULL) {
+            PyOS_snprintf(buffer, sizeof(buffer),
+                          "<weakref at %p; to '%.50s' at %p (%s)>",
+                          self,
+                          Py_TYPE(PyWeakref_GET_OBJECT(self))->tp_name,
+                          PyWeakref_GET_OBJECT(self),
+                          name);
+        }
+        else {
+            PyOS_snprintf(buffer, sizeof(buffer),
+                          "<weakref at %p; to '%.50s' at %p>",
+                          self,
+                          Py_TYPE(PyWeakref_GET_OBJECT(self))->tp_name,
+                          PyWeakref_GET_OBJECT(self));
+        }
         Py_XDECREF(nameobj);
     }
     return PyString_FromString(buffer);