diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-12-30 18:09:21 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-12-30 18:09:21 +0000 |
| commit | b5352f2d51056bf47eca9ba8378656786eb06baa (patch) | |
| tree | f2127ceb2282d17208a9f610753d4d98eafc7b80 | |
| parent | fd83714aa0c6c4ae0bfc3477f6e0608716812866 (diff) | |
| download | glibc-b5352f2d51056bf47eca9ba8378656786eb06baa.tar.gz glibc-b5352f2d51056bf47eca9ba8378656786eb06baa.tar.xz glibc-b5352f2d51056bf47eca9ba8378656786eb06baa.zip | |
[BZ #2080]
* libio/iogetwline.c (_IO_getwline_info): Move return to correct location.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | libio/iogetwline.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 2c2224e4b9..1fe2d881e2 100644 --- 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 index e529b7d832..45db478423 100644 --- 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--; |