[Python-checkins] CVS: python/dist/src/Mac/Python macimport.c,1.13,1.14

Jack Jansen jackjansen@users.sourceforge.net
Wed, 05 Dec 2001 15:27:47 -0800


Update of /cvsroot/python/python/dist/src/Mac/Python
In directory usw-pr-cvs1:/tmp/cvs-serv24483/Python/Mac/Python

Modified Files:
	macimport.c 
Log Message:
Replace sprintf() with PyOS_snprintf().

Index: macimport.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Python/macimport.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** macimport.c	2001/11/05 14:36:32	1.13
--- macimport.c	2001/12/05 23:27:44	1.14
***************
*** 224,228 ****
  		shortname = lastdot+1;
  	}
! 	sprintf(funcname, FUNCNAME_PATTERN, shortname);
  	if( !findnamedresource((PyStringObject *)0, name, pathname, 'PYD ', fragmentname)) {
  		PyErr_SetString(PyExc_ImportError, "PYD resource not found");
--- 224,228 ----
  		shortname = lastdot+1;
  	}
! 	PyOS_snprintf(funcname, sizeof(funcname), FUNCNAME_PATTERN, shortname);
  	if( !findnamedresource((PyStringObject *)0, name, pathname, 'PYD ', fragmentname)) {
  		PyErr_SetString(PyExc_ImportError, "PYD resource not found");
***************
*** 236,240 ****
  			      errMessage);
  	if ( err ) {
! 		sprintf(buf, "%.*s: %.200s",
  			errMessage[0], errMessage+1,
  			PyMac_StrError(err));
--- 236,240 ----
  			      errMessage);
  	if ( err ) {
! 		PyOS_snprintf(buf, sizeof(buf), "%.*s: %.200s",
  			errMessage[0], errMessage+1,
  			PyMac_StrError(err));
***************
*** 245,249 ****
  	err = FindSymbol(connID, Pstring(funcname), &symAddr, &class);
  	if ( err ) {
! 		sprintf(buf, "%s: %.200s",
  			funcname, PyMac_StrError(err));
  		PyErr_SetString(PyExc_ImportError, buf);
--- 245,249 ----
  	err = FindSymbol(connID, Pstring(funcname), &symAddr, &class);
  	if ( err ) {
! 		PyOS_snprintf(buf, sizeof(buf), "%s: %.200s",
  			funcname, PyMac_StrError(err));
  		PyErr_SetString(PyExc_ImportError, buf);
***************
*** 406,410 ****
  		char buf[512];
  		
! 		sprintf(buf, "%s: %s", filename, PyMac_StrError(err));
  		PyErr_SetString(PyExc_ImportError, buf);
  		return NULL;
--- 406,410 ----
  		char buf[512];
  		
! 		PyOS_snprintf(buf, sizeof(buf), "%s: %s", filename, PyMac_StrError(err));
  		PyErr_SetString(PyExc_ImportError, buf);
  		return NULL;