diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:34:38 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:34:38 +0000 |
commit | 7576c27563a3e43c0a276bf222244bcaf220a6fa (patch) | |
tree | ad96fd1f1b9b57a50005db7803f6b79e748bb820 /debug/fgetws_chk.c | |
parent | ab5f5211585bf0f33bbfa2d4aaf17e4f0d1fa564 (diff) | |
parent | 064374be911f72dfaec8a75f06da1f9fc1827712 (diff) |
Merge branch 't/hurdsig-global-dispositions' into refs/top-bases/t/hurdsig-SA_SIGINFO
Diffstat (limited to 'debug/fgetws_chk.c')
-rw-r--r-- | debug/fgetws_chk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debug/fgetws_chk.c b/debug/fgetws_chk.c index a3b7b82459..2380059f0f 100644 --- a/debug/fgetws_chk.c +++ b/debug/fgetws_chk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993-2016 Free Software Foundation, Inc. +/* Copyright (C) 1993-2018 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 @@ -20,9 +20,9 @@ #include <sys/param.h> wchar_t * -__fgetws_chk (wchar_t *buf, size_t size, int n, _IO_FILE *fp) +__fgetws_chk (wchar_t *buf, size_t size, int n, FILE *fp) { - _IO_size_t count; + size_t count; wchar_t *result; int old_error; CHECK_FILE (fp, NULL); @@ -32,8 +32,8 @@ __fgetws_chk (wchar_t *buf, size_t size, int n, _IO_FILE *fp) /* This is very tricky since a file descriptor may be in the non-blocking mode. The error flag doesn't mean much in this case. We return an error only when there is a new error. */ - old_error = fp->_IO_file_flags & _IO_ERR_SEEN; - fp->_IO_file_flags &= ~_IO_ERR_SEEN; + old_error = fp->_flags & _IO_ERR_SEEN; + fp->_flags &= ~_IO_ERR_SEEN; count = _IO_getwline (fp, buf, MIN ((size_t) n - 1, size), L'\n', 1); /* If we read in some bytes and errno is EAGAIN, that error will be reported for next read. */ @@ -46,7 +46,7 @@ __fgetws_chk (wchar_t *buf, size_t size, int n, _IO_FILE *fp) buf[count] = '\0'; result = buf; } - fp->_IO_file_flags |= old_error; + fp->_flags |= old_error; _IO_release_lock (fp); return result; } |