From: Guido van Rossum <guido@python.org>
Date: Mon, 8 Jan 2001 01:26:47 +0000 (+0000)
Subject: Let's hope that three time's a charm...
X-Git-Tag: v2.1a1~391
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8628206b954541e1d47fe38f4c215ebbdb16baed;p=thirdparty%2FPython%2Fcpython.git

Let's hope that three time's a charm...

Tim discovered another "bug" in my get_line() code: while the comments
said that n<0 was invalid, it was in fact still called with n<0 (when
PyFile_GetLine() was called with n<0).  In that case fortunately
executed the same code as for n==0.

Changed the comment to admit this fact, and changed Tim's MS speed
hack code to use 'n <= 0' as the criteria for the speed hack.
---

diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 485c378aeea6..f13aa545787a 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -804,8 +804,7 @@ ms_getline_hack(FILE *fp)
 /* Internal routine to get a line.
    Size argument interpretation:
    > 0: max length;
-   = 0: read arbitrary line;
-   < 0: invalid
+   <= 0: read arbitrary line
 */
 
 #ifdef HAVE_GETC_UNLOCKED
@@ -828,7 +827,8 @@ get_line(PyFileObject *f, int n)
 	PyObject *v;
 
 #ifdef USE_MS_GETLINE_HACK
-	if (n == 0)
+	
+	if (n <= 0)
 		return ms_getline_hack(fp);
 #endif
 	n2 = n > 0 ? n : 100;