[Python-checkins] CVS: python/dist/src/Objects fileobject.c,2.77,2.78

[M.-A. Lemburg]

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

Modified Files:
	fileobject.c 
Log Message:
Fix to bug #389:

Full_Name: Bastian Kleineidam
Version: 2.0b1 CVS 5.7.2000
OS: Debian Linux 2.2
Submission from: earth.cs.uni-sb.de (134.96.252.92)

Index: fileobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/fileobject.c,v
retrieving revision 2.77
retrieving revision 2.78
diff -C2 -r2.77 -r2.78
*** fileobject.c	2000/06/30 23:58:05	2.77
--- fileobject.c	2000/07/05 15:32:40	2.78
***************
*** 584,588 ****
  
  static PyObject *
! getline(f, n)
  	PyFileObject *f;
  	int n;
--- 584,588 ----
  
  static PyObject *
! get_line(f, n)
  	PyFileObject *f;
  	int n;
***************
*** 706,710 ****
  	if (((PyFileObject*)f)->f_fp == NULL)
  		return err_closed();
! 	return getline((PyFileObject *)f, n);
  }
  
--- 706,710 ----
  	if (((PyFileObject*)f)->f_fp == NULL)
  		return err_closed();
! 	return get_line((PyFileObject *)f, n);
  }
  
***************
*** 726,730 ****
  	if (n < 0)
  		n = 0;
! 	return getline(f, n);
  }
  
--- 726,730 ----
  	if (n < 0)
  		n = 0;
! 	return get_line(f, n);
  }
  
***************
*** 820,824 ****
  		if (sizehint > 0) {
  			/* Need to complete the last line */
! 			PyObject *rest = getline(f, 0);
  			if (rest == NULL) {
  				Py_DECREF(line);
--- 820,824 ----
  		if (sizehint > 0) {
  			/* Need to complete the last line */
! 			PyObject *rest = get_line(f, 0);
  			if (rest == NULL) {
  				Py_DECREF(line);