[Python-checkins] CVS: python/dist/src/Objects stringobject.c,2.126,2.127

[Barry Warsaw]

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv11992

Modified Files:
	stringobject.c 
Log Message:
Two improvements suggested by Greg Stein:

PyString_FromFormatV(): In the final resize at the end, we can use
    PyString_AS_STRING() since we know the object is a string and can
    avoid the typechecking.

PyString_FromFormat(): GS sez: "For safety/propriety, you should call
    va_end() on the vargs variable."


Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.126
retrieving revision 2.127
diff -C2 -d -r2.126 -r2.127
*** stringobject.c	2001/08/25 03:02:28	2.126
--- stringobject.c	2001/08/27 03:11:09	2.127
***************
*** 293,297 ****
  	
   end:
! 	_PyString_Resize(&string, s - PyString_AsString(string));
  	return string;
  }
--- 293,297 ----
  	
   end:
! 	_PyString_Resize(&string, s - PyString_AS_STRING(string));
  	return string;
  }
***************
*** 300,303 ****
--- 300,304 ----
  PyString_FromFormat(const char *format, ...) 
  {
+ 	PyObject* ret;
  	va_list vargs;
  
***************
*** 307,311 ****
  	va_start(vargs);
  #endif
! 	return PyString_FromFormatV(format, vargs);
  }
  
--- 308,314 ----
  	va_start(vargs);
  #endif
! 	ret = PyString_FromFormatV(format, vargs);
! 	va_end(vargs);
! 	return ret;
  }