From: Gregory P. Smith <greg@krypto.org>
Date: Sat, 2 Feb 2013 00:13:27 +0000 (-0800)
Subject: Silence a -Wformat-extra-argument warning when compiling.
X-Git-Tag: v2.7.4rc1~164^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0022b2d8c3f1e2c48fcb01e9151c92ac61c3ed9;p=python

Silence a -Wformat-extra-argument warning when compiling.
---

diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index 99bf42bfec..871c248ff2 100644
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -167,13 +167,21 @@ weakref_repr(PyWeakReference *self)
                 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);