1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix to bug #389:

Browse Source 
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)
This commit is contained in:
Marc-André Lemburg 2000-07-05 15:32:40 +00:00
parent da13f89fee
commit 1f46860a29
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Objects/fileobject.c
View File

@ -583,7 +583,7 @@ file_readinto(f, args)
*/ */
static PyObject * static PyObject *
getline(f, n) get_line(f, n)
PyFileObject *f; PyFileObject *f;
int n; int n;
{ {
@ -705,7 +705,7 @@ PyFile_GetLine(f, n)
} }
if (((PyFileObject*)f)->f_fp == NULL) if (((PyFileObject*)f)->f_fp == NULL)
return err_closed(); return err_closed();
return getline((PyFileObject *)f, n); return get_line((PyFileObject *)f, n);
} }
/* Python method */ /* Python method */
@ -725,7 +725,7 @@ file_readline(f, args)
return PyString_FromString(""); return PyString_FromString("");
if (n < 0) if (n < 0)
n = 0; n = 0;
return getline(f, n); return get_line(f, n);
} }
static PyObject * static PyObject *
@ -819,7 +819,7 @@ file_readlines(f, args)
goto error; goto error;
if (sizehint > 0) { if (sizehint > 0) {
/* Need to complete the last line */ /* Need to complete the last line */
PyObject *rest = getline(f, 0); PyObject *rest = get_line(f, 0);
if (rest == NULL) { if (rest == NULL) {
Py_DECREF(line); Py_DECREF(line);
goto error; goto error;