]> granicus.if.org Git - python/commitdiff
Silence a -Wformat-extra-argument warning when compiling.
authorGregory P. Smith <greg@krypto.org>
Sat, 2 Feb 2013 00:13:27 +0000 (16:13 -0800)
committerGregory P. Smith <greg@krypto.org>
Sat, 2 Feb 2013 00:13:27 +0000 (16:13 -0800)
Objects/weakrefobject.c

index 99bf42bfece828ff6b0c37f5d104e21988a17640..871c248ff2e7a4aa1041a7646d6370eea34e64b9 100644 (file)
@@ -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);