diff options
| author | Gregory P. Smith <greg@krypto.org> | 2013-02-02 00:13:27 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2013-02-02 00:13:27 (GMT) |
| commit | c0022b2d8c3f1e2c48fcb01e9151c92ac61c3ed9 (patch) | |
| tree | b4a74c416a66f4c79bd600edb584a091516879f5 | |
| parent | acf7b952192d40745c15a0104ba9d444a10b11d3 (diff) | |
| download | cpython-c0022b2d8c3f1e2c48fcb01e9151c92ac61c3ed9.zip cpython-c0022b2d8c3f1e2c48fcb01e9151c92ac61c3ed9.tar.gz cpython-c0022b2d8c3f1e2c48fcb01e9151c92ac61c3ed9.tar.bz2 | |
Silence a -Wformat-extra-argument warning when compiling.
| -rw-r--r-- | Objects/weakrefobject.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index 99bf42b..871c248 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); |