[Python-checkins] CVS: python/dist/src/Modules arraymodule.c,2.41,2.42

[Guido van Rossum]

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

Modified Files:
	arraymodule.c 
Log Message:
Trent Mick: use size_t instead of int where appropriate (in
fromfile(), to hold fread() result.)


Index: arraymodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/arraymodule.c,v
retrieving revision 2.41
retrieving revision 2.42
diff -C2 -r2.41 -r2.42
*** arraymodule.c	2000/06/28 17:49:30	2.41
--- arraymodule.c	2000/06/28 21:27:21	2.42
***************
*** 1028,1032 ****
  		char *item = self->ob_item;
  		int itemsize = self->ob_descr->itemsize;
! 		int nread;
  		int newlength;
  		size_t newbytes;
--- 1028,1032 ----
  		char *item = self->ob_item;
  		int itemsize = self->ob_descr->itemsize;
! 		size_t nread;
  		int newlength;
  		size_t newbytes;
***************
*** 1046,1050 ****
  		nread = fread(item + (self->ob_size - n) * itemsize,
  			      itemsize, n, fp);
! 		if (nread < n) {
  			self->ob_size -= (n - nread);
  			PyMem_RESIZE(item, char, self->ob_size*itemsize);
--- 1046,1050 ----
  		nread = fread(item + (self->ob_size - n) * itemsize,
  			      itemsize, n, fp);
! 		if (nread < (size_t)n) {
  			self->ob_size -= (n - nread);
  			PyMem_RESIZE(item, char, self->ob_size*itemsize);