diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:36:51 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:36:51 +0000 |
commit | 05fa8834c6644f12405ea713c48693bf2d1864f1 (patch) | |
tree | c6b6391884370c75972a2e432d42ebbb076a0cdf /libio/ioftell.c | |
parent | 525c181a5a9a95e24d2111b7792608151a40eb84 (diff) | |
parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) |
Merge commit 'refs/top-bases/t/bigmem' into t/bigmemt/bigmem
Diffstat (limited to 'libio/ioftell.c')
-rw-r--r-- | libio/ioftell.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libio/ioftell.c b/libio/ioftell.c index a05693b2f6..571a648788 100644 --- a/libio/ioftell.c +++ b/libio/ioftell.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 @@ -30,9 +30,9 @@ /* ANSI explicily requires setting errno to a positive value on failure. */ long int -_IO_ftell (_IO_FILE *fp) +_IO_ftell (FILE *fp) { - _IO_off64_t pos; + off64_t pos; CHECK_FILE (fp, -1L); _IO_acquire_lock (fp); pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0); @@ -44,23 +44,17 @@ _IO_ftell (_IO_FILE *fp) _IO_release_lock (fp); if (pos == _IO_pos_BAD) { -#ifdef EIO if (errno == 0) __set_errno (EIO); -#endif return -1L; } - if ((_IO_off64_t) (long int) pos != pos) + if ((off64_t) (long int) pos != pos) { -#ifdef EOVERFLOW __set_errno (EOVERFLOW); -#endif return -1L; } return pos; } libc_hidden_def (_IO_ftell) -#ifdef weak_alias weak_alias (_IO_ftell, ftell) -#endif |