qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BZ #2080] 

* libio/iogetwline.c (_IO_getwline_info): Move return to correct
	location.
This commit is contained in:
Ulrich Drepper 2005-12-30 18:09:21 +00:00
parent fd83714aa0
commit b5352f2d51
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2005-12-30 Ulrich Drepper <drepper@redhat.com> 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/connections.c: Remove last remnants of -S option support.
* nscd/nscd.c: Likewise. * nscd/nscd.c: Likewise.
* nscd/nscd.h: Likewise. * nscd/nscd.h: Likewise.

4
libio/iogetwline.c
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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; *ptr++ = wc;
else if (extract_delim < 0) else if (extract_delim < 0)
INTUSE(_IO_sputbackc) (fp, wc); INTUSE(_IO_sputbackc) (fp, wc);
return ptr - buf;
if (extract_delim > 0) if (extract_delim > 0)
++len; ++len;
return ptr - buf;
} }
*ptr++ = wc; *ptr++ = wc;
n--; n--;