summaryrefslogtreecommitdiffstats
path: root/Objects/object.c
diff options
context:
space:
mode:
authorZackery Spytz <zspytz@gmail.com>2019-05-06 16:56:51 (GMT)
committerBrett Cannon <54418+brettcannon@users.noreply.github.com>2019-05-06 16:56:50 (GMT)
commit1a2252ed39bc1b71cdaa935d7726d82909af93ab (patch)
tree7a816ef20b914628f61cce377a9b245933ff6ec9 /Objects/object.c
parentae2c32f32b61f3b141ba4b0b1ad71781d2f9a1a1 (diff)
downloadcpython-1a2252ed39bc1b71cdaa935d7726d82909af93ab.zip
cpython-1a2252ed39bc1b71cdaa935d7726d82909af93ab.tar.gz
cpython-1a2252ed39bc1b71cdaa935d7726d82909af93ab.tar.bz2
bpo-36594: Fix incorrect use of %p in format strings (GH-12769)
In addition, fix some other minor violations of C99.
Diffstat (limited to 'Objects/object.c')
-rw-r--r--Objects/object.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Objects/object.c b/Objects/object.c
index 589bf36..732f9cc 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -385,7 +385,7 @@ PyObject_Print(PyObject *op, FILE *fp, int flags)
universally available */
Py_BEGIN_ALLOW_THREADS
fprintf(fp, "<refcnt %ld at %p>",
- (long)op->ob_refcnt, op);
+ (long)op->ob_refcnt, (void *)op);
Py_END_ALLOW_THREADS
}
else {
@@ -499,7 +499,7 @@ _PyObject_Dump(PyObject* op)
"address : %p\n",
Py_TYPE(op)==NULL ? "NULL" : Py_TYPE(op)->tp_name,
(long)op->ob_refcnt,
- op);
+ (void *)op);
fflush(stderr);
}
@@ -1894,7 +1894,7 @@ _Py_PrintReferences(FILE *fp)
PyObject *op;
fprintf(fp, "Remaining objects:\n");
for (op = refchain._ob_next; op != &refchain; op = op->_ob_next) {
- fprintf(fp, "%p [%" PY_FORMAT_SIZE_T "d] ", op, op->ob_refcnt);
+ fprintf(fp, "%p [%" PY_FORMAT_SIZE_T "d] ", (void *)op, op->ob_refcnt);
if (PyObject_Print(op, fp, 0) != 0)
PyErr_Clear();
putc('\n', fp);
@@ -1910,7 +1910,7 @@ _Py_PrintReferenceAddresses(FILE *fp)
PyObject *op;
fprintf(fp, "Remaining object addresses:\n");
for (op = refchain._ob_next; op != &refchain; op = op->_ob_next)
- fprintf(fp, "%p [%" PY_FORMAT_SIZE_T "d] %s\n", op,
+ fprintf(fp, "%p [%" PY_FORMAT_SIZE_T "d] %s\n", (void *)op,
op->ob_refcnt, Py_TYPE(op)->tp_name);
}
@@ -2167,7 +2167,7 @@ _PyObject_AssertFailed(PyObject *obj, const char *expr, const char *msg,
fprintf(stderr, "<object: ob_type=NULL>\n");
}
else if (_PyObject_IsFreed((PyObject *)Py_TYPE(obj))) {
- fprintf(stderr, "<object: freed type %p>\n", Py_TYPE(obj));
+ fprintf(stderr, "<object: freed type %p>\n", (void *)Py_TYPE(obj));
}
else {
/* Diplay the traceback where the object has been allocated.