From df6c012b99499d95ed7fee53553a9f4d4473ccae Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Wed, 7 Feb 2018 19:41:01 -0500 Subject: Remove _IO_file_flags define. This entirely mechanical (except for some indentation fixups) patch replaces all uses of _IO_file_flags with _flags and removes the #define. Installed stripped libraries and executables are unchanged by this patch. * libio/libio.h (_IO_file_flags): Remove macro. All uses changed to _flags. --- libio/libio.h | 81 ++++++++++++++++++----------------------------------------- 1 file changed, 25 insertions(+), 56 deletions(-) (limited to 'libio/libio.h') diff --git a/libio/libio.h b/libio/libio.h index a3c679ca66..df40bfd5ba 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -60,45 +60,34 @@ typedef union #include -/* compatibility defines */ -#define _IO_file_flags _flags - -/* open modes */ +/* _IO_seekoff modes */ #define _IOS_INPUT 1 #define _IOS_OUTPUT 2 -#define _IOS_ATEND 4 -#define _IOS_APPEND 8 -#define _IOS_TRUNC 16 -#define _IOS_NOCREATE 32 -#define _IOS_NOREPLACE 64 -#define _IOS_BIN 128 - -/* Magic numbers and bits for the _flags field. - The magic numbers use the high-order bits of _flags; - the remaining bits are available for variable flags. - Note: The magic numbers must all be negative if stdio - emulation is desired. */ - -#define _IO_MAGIC 0xFBAD0000 /* Magic number */ -#define _OLD_STDIO_MAGIC 0xFABC0000 /* Emulate old stdio. */ -#define _IO_MAGIC_MASK 0xFFFF0000 -#define _IO_USER_BUF 1 /* User owns buffer; don't delete it on close. */ -#define _IO_UNBUFFERED 2 -#define _IO_NO_READS 4 /* Reading not allowed */ -#define _IO_NO_WRITES 8 /* Writing not allowd */ -#define _IO_EOF_SEEN 0x10 -#define _IO_ERR_SEEN 0x20 -#define _IO_DELETE_DONT_CLOSE 0x40 /* Don't call close(_fileno) on cleanup. */ -#define _IO_LINKED 0x80 /* Set if linked (using _chain) to streambuf::_list_all.*/ -#define _IO_IN_BACKUP 0x100 -#define _IO_LINE_BUF 0x200 -#define _IO_TIED_PUT_GET 0x400 /* Set if put and get pointer logicly tied. */ -#define _IO_CURRENTLY_PUTTING 0x800 -#define _IO_IS_APPENDING 0x1000 -#define _IO_IS_FILEBUF 0x2000 -#define _IO_BAD_SEEN 0x4000 -#define _IO_USER_LOCK 0x8000 +/* Magic number and bits for the _flags field. The magic number is + mostly vestigial, but preserved for compatibility. It occupies the + high 16 bits of _flags; the low 16 bits are actual flag bits. */ + +#define _IO_MAGIC 0xFBAD0000 /* Magic number */ +#define _IO_MAGIC_MASK 0xFFFF0000 +#define _IO_USER_BUF 0x0001 /* Don't deallocate buffer on close. */ +#define _IO_UNBUFFERED 0x0002 +#define _IO_NO_READS 0x0004 /* Reading not allowed. */ +#define _IO_NO_WRITES 0x0008 /* Writing not allowed. */ +#define _IO_EOF_SEEN 0x0010 +#define _IO_ERR_SEEN 0x0020 +#define _IO_DELETE_DONT_CLOSE 0x0040 /* Don't call close(_fileno) on close. */ +#define _IO_LINKED 0x0080 /* In the list of all open files. */ +#define _IO_IN_BACKUP 0x0100 +#define _IO_LINE_BUF 0x0200 +#define _IO_TIED_PUT_GET 0x0400 /* Put and get pointer move in unison. */ +#define _IO_CURRENTLY_PUTTING 0x0800 +#define _IO_IS_APPENDING 0x1000 +#define _IO_IS_FILEBUF 0x2000 + /* 0x4000 No longer used, reserved for compat. */ +#define _IO_USER_LOCK 0x8000 + +/* Bits for the _flags2 field. */ #define _IO_FLAGS2_MMAP 1 #define _IO_FLAGS2_NOTCANCEL 2 #define _IO_FLAGS2_FORTIFY 4 @@ -108,30 +97,10 @@ typedef union #define _IO_FLAGS2_CLOEXEC 64 #define _IO_FLAGS2_NEED_LOCK 128 -/* These are "formatting flags" matching the iostream fmtflags enum values. */ -#define _IO_SKIPWS 01 -#define _IO_LEFT 02 -#define _IO_RIGHT 04 -#define _IO_INTERNAL 010 -#define _IO_DEC 020 -#define _IO_OCT 040 -#define _IO_HEX 0100 -#define _IO_SHOWBASE 0200 -#define _IO_SHOWPOINT 0400 -#define _IO_UPPERCASE 01000 -#define _IO_SHOWPOS 02000 -#define _IO_SCIENTIFIC 04000 -#define _IO_FIXED 010000 -#define _IO_UNITBUF 020000 -#define _IO_STDIO 040000 -#define _IO_DONT_CLOSE 0100000 -#define _IO_BOOLALPHA 0200000 - struct _IO_jump_t; /* A streammarker remembers a position in a buffer. */ - struct _IO_marker { struct _IO_marker *_next; FILE *_sbuf; -- cgit v1.2.3