aboutsummaryrefslogtreecommitdiff
path: root/libio
diff options
context:
space:
mode:
Diffstat (limited to 'libio')
-rw-r--r--libio/genops.c1
-rw-r--r--libio/iofdopen.c20
-rw-r--r--libio/iopopen.c4
-rw-r--r--libio/iovdprintf.c24
-rw-r--r--libio/libioP.h2
-rw-r--r--libio/stdfiles.c2
-rw-r--r--libio/stdio.c3
-rw-r--r--libio/stdio.h8
8 files changed, 29 insertions, 35 deletions
diff --git a/libio/genops.c b/libio/genops.c
index f8342776f5..20d0df2d89 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -710,7 +710,6 @@ _IO_cleanup ()
_IO_unbuffer_all ();
}
-_IO_FILE *_IO_list_all = &_IO_stderr_.plus.file;
void
_IO_init_marker (marker, fp)
diff --git a/libio/iofdopen.c b/libio/iofdopen.c
index 841e7032b8..b6508255d0 100644
--- a/libio/iofdopen.c
+++ b/libio/iofdopen.c
@@ -42,7 +42,7 @@ _IO_fdopen (fd, mode)
int posix_mode = 0;
struct locked_FILE
{
- struct _IO_FILE_plus fp;
+ struct _IO_FILE_complete fp;
#ifdef _IO_MTSAFE_IO
_IO_lock_t lock;
#endif
@@ -106,24 +106,24 @@ _IO_fdopen (fd, mode)
if (new_f == NULL)
return NULL;
#ifdef _IO_MTSAFE_IO
- new_f->fp.file._lock = &new_f->lock;
+ new_f->fp.plus.file._lock = &new_f->lock;
#endif
- _IO_init (&new_f->fp.file, 0);
- _IO_JUMPS (&new_f->fp.file) = &_IO_file_jumps;
- _IO_file_init (&new_f->fp.file);
+ _IO_init (&new_f->fp.plus.file, 0);
+ _IO_JUMPS (&new_f->fp.plus.file) = &_IO_file_jumps;
+ _IO_file_init (&new_f->fp.plus.file);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.vtable = NULL;
#endif
- if (_IO_file_attach (&new_f->fp.file, fd) == NULL)
+ if (_IO_file_attach (&new_f->fp.plus.file, fd) == NULL)
{
- _IO_un_link (&new_f->fp.file);
+ _IO_un_link (&new_f->fp.plus.file);
free (new_f);
return NULL;
}
- new_f->fp.file._flags &= ~_IO_DELETE_DONT_CLOSE;
+ new_f->fp.plus.file._flags &= ~_IO_DELETE_DONT_CLOSE;
- new_f->fp.file._IO_file_flags =
- _IO_mask_flags (&new_f->fp.file, read_write,
+ new_f->fp.plus.file._IO_file_flags =
+ _IO_mask_flags (&new_f->fp.plus.file, read_write,
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
return (_IO_FILE *) &new_f->fp;
diff --git a/libio/iopopen.c b/libio/iopopen.c
index f0589bf184..65337f8f28 100644
--- a/libio/iopopen.c
+++ b/libio/iopopen.c
@@ -74,7 +74,7 @@ extern int _IO_dup2 __P ((int fd, int fd2));
struct _IO_proc_file
{
- struct _IO_FILE_plus file;
+ struct _IO_FILE_complete file;
/* Following fields must match those in class procbuf (procbuf.h) */
_IO_pid_t pid;
struct _IO_proc_file *next;
@@ -169,7 +169,7 @@ _IO_popen (command, mode)
if (new_f == NULL)
return NULL;
#ifdef _IO_MTSAFE_IO
- new_f->fpx.file.file._lock = &new_f->lock;
+ new_f->fpx.file.plus.file._lock = &new_f->lock;
#endif
fp = (_IO_FILE*)&new_f->fpx;
_IO_init (fp, 0);
diff --git a/libio/iovdprintf.c b/libio/iovdprintf.c
index a24d3b535e..04b40e7553 100644
--- a/libio/iovdprintf.c
+++ b/libio/iovdprintf.c
@@ -32,35 +32,35 @@ _IO_vdprintf (d, format, arg)
const char *format;
_IO_va_list arg;
{
- struct _IO_FILE_plus tmpfil;
+ struct _IO_FILE_complete tmpfil;
#ifdef _IO_MTSAFE_IO
_IO_lock_t lock;
#endif
int done;
#ifdef _IO_MTSAFE_IO
- tmpfil.file._lock = &lock;
+ tmpfil.plus.file._lock = &lock;
#endif
- _IO_init (&tmpfil.file, 0);
- _IO_JUMPS (&tmpfil.file) = &_IO_file_jumps;
- _IO_file_init (&tmpfil.file);
+ _IO_init (&tmpfil.plus.file, 0);
+ _IO_JUMPS (&tmpfil.plus.file) = &_IO_file_jumps;
+ _IO_file_init (&tmpfil.plus.file);
#if !_IO_UNIFIED_JUMPTABLES
tmpfil.vtable = NULL;
#endif
- if (_IO_file_attach (&tmpfil.file, d) == NULL)
+ if (_IO_file_attach (&tmpfil.plus.file, d) == NULL)
{
- _IO_un_link (&tmpfil.file);
+ _IO_un_link (&tmpfil.plus.file);
return EOF;
}
- tmpfil.file._flags &= ~_IO_DELETE_DONT_CLOSE;
+ tmpfil.plus.file._flags &= ~_IO_DELETE_DONT_CLOSE;
- tmpfil.file._IO_file_flags =
- _IO_mask_flags (&tmpfil.file, _IO_NO_READS,
+ tmpfil.plus.file._IO_file_flags =
+ _IO_mask_flags (&tmpfil.plus.file, _IO_NO_READS,
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
- done = _IO_vfprintf (&tmpfil.file, format, arg);
+ done = _IO_vfprintf (&tmpfil.plus.file, format, arg);
- _IO_FINISH (&tmpfil.file);
+ _IO_FINISH (&tmpfil.plus.file);
return done;
}
diff --git a/libio/libioP.h b/libio/libioP.h
index 97c3206c4d..a90a604e53 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -273,7 +273,7 @@ struct _IO_FILE_plus
same. */
struct _IO_FILE_complete
{
- struct _IO_FILE_plus plus;;
+ struct _IO_FILE_plus plus;
_IO_off64_t _offset;
int _unused2[16]; /* Make sure we don't get into trouble again. */
};
diff --git a/libio/stdfiles.c b/libio/stdfiles.c
index c563f2aed0..56861666af 100644
--- a/libio/stdfiles.c
+++ b/libio/stdfiles.c
@@ -51,7 +51,7 @@ DEF_STDFILE(_IO_new_stdout_, _IO_stdout_, 1, &_IO_stdin_.plus.file,
DEF_STDFILE(_IO_new_stderr_, _IO_stderr_, 2, &_IO_stdout_.plus.file,
_IO_NO_READS+_IO_UNBUFFERED);
+_IO_FILE *_IO_list_all = &_IO_stderr_.plus.file;
#if 0
-_IO_FILE *_IO_new_list_all = &_IO_stderr_.plus.file;
default_symbol_version (_IO_new_list_all, _IO_list_all, GLIBC_2.1);
#endif
diff --git a/libio/stdio.c b/libio/stdio.c
index c8b3ba5a00..d38379f821 100644
--- a/libio/stdio.c
+++ b/libio/stdio.c
@@ -26,9 +26,6 @@
#include "libioP.h"
#include "stdio.h"
-/* Define non-macro versions of stdin/stdout/stderr, for use by
- debuggers. */
-
#undef stdin
#undef stdout
#undef stderr
diff --git a/libio/stdio.h b/libio/stdio.h
index a835fed6cc..da796ecbe4 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -127,11 +127,9 @@ extern void __libc_fatal __P ((__const char *__message))
/* Standard streams. */
-extern FILE *stdin, *stdout, *stderr;
-/* Refer to the real names by default. */
-#define stdin _IO_stdin
-#define stdout _IO_stdout
-#define stderr _IO_stderr
+extern FILE *stdin; /* Standard input stream. */
+extern FILE *stdout; /* Standard output stream. */
+extern FILE *stderr; /* Standard error output stream. */
/* Remove file FILENAME. */