[BZ #2080]

* libio/iogetwline.c (_IO_getwline_info): Move return to correct location.
git-mirror · Dec 30, 2005 · b5352f2 · b5352f2
1 parent fd83714
commit b5352f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,9 @@
 2005-12-30  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #2080]
+	* libio/iogetwline.c (_IO_getwline_info): Move return to correct
+	location.
+
 	* nscd/connections.c: Remove last remnants of -S option support.
 	* nscd/nscd.c: Likewise.
 	* nscd/nscd.h: Likewise.

diff --git a/libio/iogetwline.c b/libio/iogetwline.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1997,1998,1999,2000,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1997-2000,2002,2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -87,9 +87,9 @@ _IO_getwline_info (fp, buf, n, delim, extract_delim, eof)
 		*ptr++ = wc;
 	      else if (extract_delim < 0)
 		INTUSE(_IO_sputbackc) (fp, wc);
-	      return ptr - buf;
 	      if (extract_delim > 0)
 		++len;
+	      return ptr - buf;
 	    }
 	  *ptr++ = wc;
 	  n--;