summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2000-06-30 15:01:00 (GMT)
committerFred Drake <fdrake@acm.org>2000-06-30 15:01:00 (GMT)
commita44d353e2b6d947d36ab9d36c1fc84335a0878fe (patch)
tree3d0add21fcb365aeeb5ac6b45add0a30e6f3b93b /Modules
parentd49e5b466731d0e68ea41655aecbe3a66b1976d9 (diff)
downloadcpython-a44d353e2b6d947d36ab9d36c1fc84335a0878fe.zip
cpython-a44d353e2b6d947d36ab9d36c1fc84335a0878fe.tar.gz
cpython-a44d353e2b6d947d36ab9d36c1fc84335a0878fe.tar.bz2
Trent Mick <trentm@activestate.com>:
The common technique for printing out a pointer has been to cast to a long and use the "%lx" printf modifier. This is incorrect on Win64 where casting to a long truncates the pointer. The "%p" formatter should be used instead. The problem as stated by Tim: > Unfortunately, the C committee refused to define what %p conversion "looks > like" -- they explicitly allowed it to be implementation-defined. Older > versions of Microsoft C even stuck a colon in the middle of the address (in > the days of segment+offset addressing)! The result is that the hex value of a pointer will maybe/maybe not have a 0x prepended to it. Notes on the patch: There are two main classes of changes: - in the various repr() functions that print out pointers - debugging printf's in the various thread_*.h files (these are why the patch is large) Closes SourceForge patch #100505.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_tkinter.c2
-rw-r--r--Modules/flmodule.c8
-rw-r--r--Modules/mpzmodule.c10
3 files changed, 10 insertions, 10 deletions
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index da90559..d7a4fe1 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1705,7 +1705,7 @@ Tktt_Repr(self)
TkttObject *v = (TkttObject *)self;
char buf[100];
- sprintf(buf, "<tktimertoken at 0x%lx%s>", (long)v,
+ sprintf(buf, "<tktimertoken at %p%s>", v,
v->func == NULL ? ", handler deleted" : "");
return PyString_FromString(buf);
}
diff --git a/Modules/flmodule.c b/Modules/flmodule.c
index c6ce439..900f381 100644
--- a/Modules/flmodule.c
+++ b/Modules/flmodule.c
@@ -435,8 +435,8 @@ generic_repr(g)
genericobject *g;
{
char buf[100];
- sprintf(buf, "<FORMS_object at %lx, objclass=%d>",
- (long)g, g->ob_generic->objclass);
+ sprintf(buf, "<FORMS_object at %p, objclass=%d>",
+ g, g->ob_generic->objclass);
return PyString_FromString(buf);
}
@@ -1906,8 +1906,8 @@ form_repr(f)
formobject *f;
{
char buf[100];
- sprintf(buf, "<FORMS_form at %lx, window=%ld>",
- (long)f, f->ob_form->window);
+ sprintf(buf, "<FORMS_form at %p, window=%ld>",
+ f, f->ob_form->window);
return PyString_FromString(buf);
}
diff --git a/Modules/mpzmodule.c b/Modules/mpzmodule.c
index af44abf..09d46b9 100644
--- a/Modules/mpzmodule.c
+++ b/Modules/mpzmodule.c
@@ -262,7 +262,7 @@ mpz_format(objp, base, withname)
#ifdef MPZ_DEBUG
fprintf(stderr,
- "mpz_format: cp (str end) 0x%x, begin 0x%x, diff %d, i %d\n",
+ "mpz_format: cp (str end) %p, begin %p, diff %d, i %d\n",
cp, PyString_AS_STRING(strobjp),
cp - PyString_AS_STRING(strobjp), i);
#endif /* def MPZ_DEBUG */
@@ -1765,7 +1765,7 @@ void *mp_allocate( alloc_size )
Py_FatalError("mp_allocate failure");
#ifdef MPZ_DEBUG
- fprintf(stderr, "mp_allocate : address 0x%08x\n", res);
+ fprintf(stderr, "mp_allocate : address %08p\n", res);
#endif /* def MPZ_DEBUG */
MP_SET_TEST(res,alloc_size);
@@ -1782,7 +1782,7 @@ void *mp_reallocate( ptr, old_size, new_size )
void *res;
#ifdef MPZ_DEBUG
- fprintf(stderr, "mp_reallocate: old address 0x%08x, old size %ld\n",
+ fprintf(stderr, "mp_reallocate: old address %08p, old size %ld\n",
ptr, old_size);
#endif /* def MPZ_DEBUG */
@@ -1792,7 +1792,7 @@ void *mp_reallocate( ptr, old_size, new_size )
Py_FatalError("mp_reallocate failure");
#ifdef MPZ_DEBUG
- fprintf(stderr, "mp_reallocate: new address 0x%08x, new size %ld\n",
+ fprintf(stderr, "mp_reallocate: new address %08p, new size %ld\n",
res, new_size);
#endif /* def MPZ_DEBUG */
@@ -1808,7 +1808,7 @@ void mp_free( ptr, size )
{
#ifdef MPZ_DEBUG
- fprintf(stderr, "mp_free : old address 0x%08x, old size %ld\n",
+ fprintf(stderr, "mp_free : old address %08p, old size %ld\n",
ptr, size);
#endif /* def MPZ_DEBUG */