diff options
| author | Zack Weinberg <zackw@panix.com> | 2018-02-21 14:38:24 -0500 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2018-02-21 14:39:54 -0500 |
| commit | 30bfee2630b960050d1d50cafaab43fc171abc03 (patch) | |
| tree | 0e07b4ca9b2e087edec24afe3bfa07b42f7cfdb2 /libio/libio.h | |
| parent | df6c012b99499d95ed7fee53553a9f4d4473ccae (diff) | |
Remove miscellaneous debris from libio.
This patch eliminates a number of #if 0 and #ifdef TODO blocks, macros
that are never used, macros that provide portability to substrates that
lack basic things like EINVAL and off_t, and other such debris.
I preserved IO_DEBUG and CHECK_FILE, even though as far as I can tell
IO_DEBUG is never defined and therefore CHECK_FILE never does
anything, because it seems like we might actually want to turn it _on_.
Installed stripped libraries and executables are unchanged, except,
again, that the line number of an assertion changes (this time it's
somewhere in fileops.c).
* libio/libio.h (_IO_pos_BAD, _IO_pos_0, _IO_pos_adjust):
Define here, unconditionally.
* libio/iolibio.h (_IO_pos_BAD): Don't define here.
* libio/libioP.h: Remove #if 0 blocks.
(_IO_pos_BAD, _IO_pos_0, _IO_pos_adjust): Don't define here.
(_IO_va_start, COERCE_FILE, MAYBE_SET_EINVAL): Don't define.
(CHECK_FILE): Don't use MAYBE_SET_EINVAL or COERCE_FILE. Fix style.
* libio/clearerr.c, libio/fputc.c, libio/getchar.c:
Assume weak_alias is always defined.
* libio/fileops.c, libio/genops.c, libio/oldfileops.c
* libio/oldpclose.c, libio/pclose.c, libio/wfileops.c:
Remove #if 0 and #ifdef TODO blocks.
Assume text_set_element is always defined.
* libio/iofdopen.c, libio/iogetdelim.c, libio/oldiofdopen.c
Use __set_errno (EINVAL) instead of MAYBE_SET_EINVAL.
* libio/tst-mmap-eofsync.c: Make #if 1 block unconditional.
Diffstat (limited to 'libio/libio.h')
| -rw-r--r-- | libio/libio.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libio/libio.h b/libio/libio.h index df40bfd5ba..00f9169613 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -97,6 +97,14 @@ typedef union #define _IO_FLAGS2_CLOEXEC 64 #define _IO_FLAGS2_NEED_LOCK 128 +/* _IO_pos_BAD is an off64_t value indicating error, unknown, or EOF. */ +#define _IO_pos_BAD ((off64_t) -1) + +/* _IO_pos_adjust adjusts an off64_t by some number of bytes. */ +#define _IO_pos_adjust(pos, delta) ((pos) += (delta)) + +/* _IO_pos_0 is an off64_t value indicating beginning of file. */ +#define _IO_pos_0 ((off64_t) 0) struct _IO_jump_t; |