[Python-checkins] CVS: python/dist/src/Objects rangeobject.c,2.17,2.18

Fred L. Drake python-dev@python.org
Thu, 3 Aug 2000 19:34:43 -0700


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

Modified Files:
	rangeobject.c 
Log Message:

snprintf() is not portable, so continue to use sprintf() until a portable
snprintf() is available.


Index: rangeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/rangeobject.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** rangeobject.c	2000/08/03 17:43:02	2.17
--- rangeobject.c	2000/08/04 02:34:41	2.18
***************
*** 66,71 ****
  
  	if (r->start == 0 && r->step == 1) {
! 		snprintf(buf1, sizeof(buf1), "xrange(%ld)",
! 			 r->start + r->len * r->step);
  	}
  	else {
--- 66,70 ----
  
  	if (r->start == 0 && r->step == 1) {
! 		sprintf(buf1, "xrange(%ld)", r->start + r->len * r->step);
  	}
  	else {
***************
*** 73,84 ****
  		if (r->step == 1)
  			fmt = "xrange(%ld, %ld)";
! 		snprintf(buf1, sizeof(buf1), fmt,
! 			 r->start,
! 			 r->start + r->len * r->step,
! 			 r->step);
  	}
  	if (r->reps != 1) {
! 		snprintf(buf2, sizeof(buf2),
! 			 "(%s * %d)", buf1, r->reps);
  	}
  	return PyString_FromString(r->reps == 1 ? buf1 : buf2);
--- 72,82 ----
  		if (r->step == 1)
  			fmt = "xrange(%ld, %ld)";
! 		sprintf(buf1, fmt,
! 			r->start,
! 			r->start + r->len * r->step,
! 			r->step);
  	}
  	if (r->reps != 1) {
! 		sprintf(buf2, "(%s * %d)", buf1, r->reps);
  	}
  	return PyString_FromString(r->reps == 1 ? buf1 : buf2);