[Python-checkins] CVS: python/dist/src/Mac/Modules/cf _CFmodule.c,1.3,1.4

Jack Jansen jackjansen@users.sourceforge.net
Wed, 05 Sep 2001 03:31:03 -0700


Update of /cvsroot/python/python/dist/src/Mac/Modules/cf
In directory usw-pr-cvs1:/tmp/cvs-serv11851/python/Mac/Modules/cf

Modified Files:
	_CFmodule.c 
Log Message:
Shut up many more gcc warnings.

Index: _CFmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/cf/_CFmodule.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _CFmodule.c	2001/09/04 22:25:43	1.3
--- _CFmodule.c	2001/09/05 10:31:01	1.4
***************
*** 6,11 ****
--- 6,15 ----
  
  
+ #ifdef _WIN32
+ #include "pywintoolbox.h"
+ #else
  #include "macglue.h"
  #include "pymactoolbox.h"
+ #endif
  
  /* Macro to test whether a weak-loaded CFM function exists */
***************
*** 273,277 ****
  {
  	char buf[100];
! 	sprintf(buf, "<CFTypeRef type-%d object at 0x%8.8x for 0x%8.8x>", CFGetTypeID(self->ob_itself), (unsigned long)self, (unsigned long)self->ob_itself);
  	return PyString_FromString(buf);
  }
--- 277,281 ----
  {
  	char buf[100];
! 	sprintf(buf, "<CFTypeRef type-%d object at 0x%8.8x for 0x%8.8x>", CFGetTypeID(self->ob_itself), (unsigned)self, (unsigned)self->ob_itself);
  	return PyString_FromString(buf);
  }
***************
*** 423,427 ****
  {
  	char buf[100];
! 	sprintf(buf, "<CFArrayRef object at 0x%08.8x for 0x%08.8x>", self, self->ob_itself);
  	return PyString_FromString(buf);
  }
--- 427,431 ----
  {
  	char buf[100];
! 	sprintf(buf, "<CFArrayRef object at 0x%8.8x for 0x%8.8x>", (unsigned)self, (unsigned)self->ob_itself);
  	return PyString_FromString(buf);
  }
***************
*** 576,580 ****
  {
  	char buf[100];
! 	sprintf(buf, "<CFMutableArrayRef object at 0x%08.8x for 0x%08.8x>", self, self->ob_itself);
  	return PyString_FromString(buf);
  }
--- 580,584 ----
  {
  	char buf[100];
! 	sprintf(buf, "<CFMutableArrayRef object at 0x%8.8x for 0x%8.8x>", (unsigned)self, (unsigned)self->ob_itself);
  	return PyString_FromString(buf);
  }
***************
*** 708,712 ****
  {
  	char buf[100];
! 	sprintf(buf, "<CFDictionaryRef object at 0x%08.8x for 0x%08.8x>", self, self->ob_itself);
  	return PyString_FromString(buf);
  }
--- 712,716 ----
  {
  	char buf[100];
! 	sprintf(buf, "<CFDictionaryRef object at 0x%8.8x for 0x%8.8x>", (unsigned)self, (unsigned)self->ob_itself);
  	return PyString_FromString(buf);
  }
***************
*** 824,828 ****
  {
  	char buf[100];
! 	sprintf(buf, "<CFMutableDictionaryRef object at 0x%08.8x for 0x%08.8x>", self, self->ob_itself);
  	return PyString_FromString(buf);
  }
--- 828,832 ----
  {
  	char buf[100];
! 	sprintf(buf, "<CFMutableDictionaryRef object at 0x%8.8x for 0x%8.8x>", (unsigned)self, (unsigned)self->ob_itself);
  	return PyString_FromString(buf);
  }
***************
*** 974,978 ****
  {
  	char buf[100];
! 	sprintf(buf, "<CFDataRef object at 0x%08.8x for 0x%08.8x>", self, self->ob_itself);
  	return PyString_FromString(buf);
  }
--- 978,982 ----
  {
  	char buf[100];
! 	sprintf(buf, "<CFDataRef object at 0x%8.8x for 0x%8.8x>", (unsigned)self, (unsigned)self->ob_itself);
  	return PyString_FromString(buf);
  }
***************
*** 1097,1101 ****
  	Py_INCREF(Py_None);
  	_res = Py_None;
-  bytes__error__: ;
  	return _res;
  }
--- 1101,1104 ----
***************
*** 1119,1123 ****
  	Py_INCREF(Py_None);
  	_res = Py_None;
-  newBytes__error__: ;
  	return _res;
  }
--- 1122,1125 ----
***************
*** 1172,1176 ****
  {
  	char buf[100];
! 	sprintf(buf, "<CFMutableDataRef object at 0x%08.8x for 0x%08.8x>", self, self->ob_itself);
  	return PyString_FromString(buf);
  }
--- 1174,1178 ----
  {
  	char buf[100];
! 	sprintf(buf, "<CFMutableDataRef object at 0x%8.8x for 0x%8.8x>", (unsigned)self, (unsigned)self->ob_itself);
  	return PyString_FromString(buf);
  }
***************
*** 1775,1779 ****
  {
  	char buf[100];
! 	sprintf(buf, "<CFStringRef object at 0x%08.8x for 0x%08.8x>", self, self->ob_itself);
  	return PyString_FromString(buf);
  }
--- 1777,1781 ----
  {
  	char buf[100];
! 	sprintf(buf, "<CFStringRef object at 0x%8.8x for 0x%8.8x>", (unsigned)self, (unsigned)self->ob_itself);
  	return PyString_FromString(buf);
  }
***************
*** 2062,2066 ****
  {
  	char buf[100];
! 	sprintf(buf, "<CFMutableStringRef object at 0x%08.8x for 0x%08.8x>", self, self->ob_itself);
  	return PyString_FromString(buf);
  }
--- 2064,2068 ----
  {
  	char buf[100];
! 	sprintf(buf, "<CFMutableStringRef object at 0x%8.8x for 0x%8.8x>", (unsigned)self, (unsigned)self->ob_itself);
  	return PyString_FromString(buf);
  }
***************
*** 2434,2438 ****
  {
  	char buf[100];
! 	sprintf(buf, "<CFURL object at 0x%08.8x for 0x%08.8x>", self, self->ob_itself);
  	return PyString_FromString(buf);
  }
--- 2436,2440 ----
  {
  	char buf[100];
! 	sprintf(buf, "<CFURL object at 0x%8.8x for 0x%8.8x>", (unsigned)self, (unsigned)self->ob_itself);
  	return PyString_FromString(buf);
  }
***************
*** 2591,2595 ****
  	_res = Py_BuildValue("O&",
  	                     CFDataRefObj_New, _rv);
-  bytes__error__: ;
  	return _res;
  }
--- 2593,2596 ----
***************
*** 2612,2616 ****
  	_res = Py_BuildValue("O&",
  	                     CFDataRefObj_New, _rv);
-  bytes__error__: ;
  	return _res;
  }
--- 2613,2616 ----
***************
*** 2849,2853 ****
  	_res = Py_BuildValue("O&",
  	                     CFStringRefObj_New, _rv);
-  bytes__error__: ;
  	return _res;
  }
--- 2849,2852 ----
***************
*** 3039,3043 ****
  	_res = Py_BuildValue("O&",
  	                     CFURLRefObj_New, _rv);
-  URLBytes__error__: ;
  	return _res;
  }
--- 3038,3041 ----