From: Jeremy Nimmer <jwnimmer@alum.mit.edu>
Date: Mon, 2 Jul 2001 05:16:24 +0000 (+0000)
Subject: For PR libgcj/3523:
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e2a6abb6d5861c6b2246db3ec72ccd0f7f9567cb;p=gcc.git

For PR libgcj/3523:

2001-07-01  Jeremy Nimmer  <jwnimmer@alum.mit.edu>

	For PR libgcj/3523:
	* java/io/LineNumberReader.java (reset): Pass correct arguments to
	countLines.

From-SVN: r43683
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9e8fcaac7b0..340531f7779 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-01  Jeremy Nimmer  <jwnimmer@alum.mit.edu>
+
+	For PR libgcj/3523:
+	* java/io/LineNumberReader.java (reset): Pass correct arguments to
+	countLines.
+
 2001-06-27  Tom Tromey  <tromey@redhat.com>
 
 	* gnu/gcj/convert/IOConverter.java: Manually maintained alias now
diff --git a/libjava/java/io/LineNumberReader.java b/libjava/java/io/LineNumberReader.java
index ffdd2b68e2e..1c57fe120f3 100644
--- a/libjava/java/io/LineNumberReader.java
+++ b/libjava/java/io/LineNumberReader.java
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2001  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -94,7 +94,7 @@ public class LineNumberReader extends BufferedReader
 	if (markPos > 0 && pos > markPos && buffer[markPos-1] == '\r'
 	    && buffer[markPos] == '\n')
 	  lineNumber--;
-	lineNumber -= countLines(buffer, pos, markPos);
+	lineNumber -= countLines(buffer, markPos, pos - markPos);
 	pos = markPos;
       }
   }