[Python-checkins] CVS: python/dist/src/Modules _tkinter.c,1.101,1.102 flmodule.c,1.36,1.37 mpzmodule.c,2.24,2.25

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv13110/Modules

Modified Files:
	_tkinter.c flmodule.c mpzmodule.c 
Log Message:
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.


Index: _tkinter.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -r1.101 -r1.102
*** _tkinter.c	2000/06/19 00:55:09	1.101
--- _tkinter.c	2000/06/30 15:00:59	1.102
***************
*** 1706,1710 ****
  	char buf[100];
  
! 	sprintf(buf, "<tktimertoken at 0x%lx%s>", (long)v,
  		v->func == NULL ? ", handler deleted" : "");
  	return PyString_FromString(buf);
--- 1706,1710 ----
  	char buf[100];
  
! 	sprintf(buf, "<tktimertoken at %p%s>", v,
  		v->func == NULL ? ", handler deleted" : "");
  	return PyString_FromString(buf);

Index: flmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/flmodule.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** flmodule.c	2000/05/03 23:44:32	1.36
--- flmodule.c	2000/06/30 15:00:59	1.37
***************
*** 436,441 ****
  {
  	char buf[100];
! 	sprintf(buf, "<FORMS_object at %lx, objclass=%d>",
! 		(long)g, g->ob_generic->objclass);
  	return PyString_FromString(buf);
  }
--- 436,441 ----
  {
  	char buf[100];
! 	sprintf(buf, "<FORMS_object at %p, objclass=%d>",
! 		g, g->ob_generic->objclass);
  	return PyString_FromString(buf);
  }
***************
*** 1907,1912 ****
  {
  	char buf[100];
! 	sprintf(buf, "<FORMS_form at %lx, window=%ld>",
! 		(long)f, f->ob_form->window);
  	return PyString_FromString(buf);
  }
--- 1907,1912 ----
  {
  	char buf[100];
! 	sprintf(buf, "<FORMS_form at %p, window=%ld>",
! 		f, f->ob_form->window);
  	return PyString_FromString(buf);
  }

Index: mpzmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/mpzmodule.c,v
retrieving revision 2.24
retrieving revision 2.25
diff -C2 -r2.24 -r2.25
*** mpzmodule.c	2000/06/28 21:29:47	2.24
--- mpzmodule.c	2000/06/30 15:00:59	2.25
***************
*** 263,267 ****
  #ifdef MPZ_DEBUG
  	fprintf(stderr,
! 		"mpz_format: cp (str end) 0x%x, begin 0x%x, diff %d, i %d\n",
  		cp, PyString_AS_STRING(strobjp),
  		cp - PyString_AS_STRING(strobjp), i);
--- 263,267 ----
  #ifdef MPZ_DEBUG
  	fprintf(stderr,
! 		"mpz_format: cp (str end) %p, begin %p, diff %d, i %d\n",
  		cp, PyString_AS_STRING(strobjp),
  		cp - PyString_AS_STRING(strobjp), i);
***************
*** 1766,1770 ****
  
  #ifdef MPZ_DEBUG
! 	fprintf(stderr, "mp_allocate  :     address 0x%08x\n", res);
  #endif /* def MPZ_DEBUG */	
  
--- 1766,1770 ----
  
  #ifdef MPZ_DEBUG
! 	fprintf(stderr, "mp_allocate  :     address %08p\n", res);
  #endif /* def MPZ_DEBUG */	
  
***************
*** 1783,1787 ****
  
  #ifdef MPZ_DEBUG
! 	fprintf(stderr, "mp_reallocate: old address 0x%08x, old size %ld\n",
  		ptr, old_size);
  #endif /* def MPZ_DEBUG */	
--- 1783,1787 ----
  
  #ifdef MPZ_DEBUG
! 	fprintf(stderr, "mp_reallocate: old address %08p, old size %ld\n",
  		ptr, old_size);
  #endif /* def MPZ_DEBUG */	
***************
*** 1793,1797 ****
  
  #ifdef MPZ_DEBUG
! 	fprintf(stderr, "mp_reallocate: new address 0x%08x, new size %ld\n",
  		res, new_size);
  #endif /* def MPZ_DEBUG */	
--- 1793,1797 ----
  
  #ifdef MPZ_DEBUG
! 	fprintf(stderr, "mp_reallocate: new address %08p, new size %ld\n",
  		res, new_size);
  #endif /* def MPZ_DEBUG */	
***************
*** 1809,1813 ****
  
  #ifdef MPZ_DEBUG
! 	fprintf(stderr, "mp_free      : old address 0x%08x, old size %ld\n",
  		ptr, size);
  #endif /* def MPZ_DEBUG */	
--- 1809,1813 ----
  
  #ifdef MPZ_DEBUG
! 	fprintf(stderr, "mp_free      : old address %08p, old size %ld\n",
  		ptr, size);
  #endif /* def MPZ_DEBUG */