diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-01-02 10:52:59 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-01-02 10:52:59 +0000 |
| commit | 0db2497936950725ae71e997091ef276a3ec43ee (patch) | |
| tree | 7d66db137accea00fe402dfabf8e5de3a4af58c6 /libio | |
| parent | b9ea6c38033d6ab0bda9dddb34cc7a4c6ff82084 (diff) | |
Updated to fedora-glibc-20060102T1045
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/iogetwline.c | 4 | ||||
| -rw-r--r-- | libio/obprintf.c | 4 |
2 files changed, 5 insertions, 3 deletions
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--; diff --git a/libio/obprintf.c b/libio/obprintf.c index 19300e80a3..1167a93d0b 100644 --- a/libio/obprintf.c +++ b/libio/obprintf.c @@ -1,5 +1,6 @@ /* Print output of stream to given obstack. - Copyright (C) 1996,1997,1999-2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1996,1997,1999,2000,2001,2002,2003,2004,2005 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -23,6 +24,7 @@ #include <stdlib.h> #endif #include "libioP.h" +#include "strfile.h" #include <assert.h> #include <string.h> #include <errno.h> |