diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-11-04 09:58:57 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-11-04 09:58:57 +0000 |
| commit | 7ea113633e51579f6bbd3f03ab350fc8f8d0424f (patch) | |
| tree | 881e2afc1e7446847ff83c9c25d119c384cf688d /libio/oldiofdopen.c | |
| parent | f0c76a28fd77c5045fe3d7c15bf4ecaae0273945 (diff) | |
| download | glibc-7ea113633e51579f6bbd3f03ab350fc8f8d0424f.tar.gz | |
Update.
2003-10-27 Daniel Jacobowitz <drow@mvista.com>
* libio/libioP.h [_IO_USE_OLD_IO_FILE]
(struct _IO_FILE_complete_plus): New type.
* libio/oldiofopen.c (_IO_old_fopen): Use _IO_FILE_complete_plus.
* libio/oldiofdopen.c (_IO_old_fdopen): Likewise.
* libio/oldiopopen.c (struct _IO_proc_file, _IO_old_popen): Likewise.
Call _IO_old_init instead of _IO_init.
Diffstat (limited to 'libio/oldiofdopen.c')
| -rw-r--r-- | libio/oldiofdopen.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libio/oldiofdopen.c b/libio/oldiofdopen.c index 824a2fb0cc..b256000c2c 100644 --- a/libio/oldiofdopen.c +++ b/libio/oldiofdopen.c @@ -48,7 +48,7 @@ _IO_old_fdopen (fd, mode) int posix_mode = 0; struct locked_FILE { - struct _IO_FILE_plus fp; + struct _IO_FILE_complete_plus fp; #ifdef _IO_MTSAFE_IO _IO_lock_t lock; #endif @@ -112,24 +112,24 @@ _IO_old_fdopen (fd, mode) if (new_f == NULL) return NULL; #ifdef _IO_MTSAFE_IO - new_f->fp.file._lock = &new_f->lock; + new_f->fp.file._file._lock = &new_f->lock; #endif - _IO_old_init (&new_f->fp.file, 0); - _IO_JUMPS (&new_f->fp) = &_IO_old_file_jumps; - _IO_old_file_init (&new_f->fp); + _IO_old_init (&new_f->fp.file._file, 0); + _IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fp) = &_IO_old_file_jumps; + _IO_old_file_init ((struct _IO_FILE_plus *) &new_f->fp); #if !_IO_UNIFIED_JUMPTABLES new_f->fp.vtable = NULL; #endif - if (_IO_old_file_attach (&new_f->fp.file, fd) == NULL) + if (_IO_old_file_attach (&new_f->fp.file._file, fd) == NULL) { - INTUSE(_IO_un_link) (&new_f->fp); + INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) &new_f->fp); free (new_f); return NULL; } - new_f->fp.file._flags &= ~_IO_DELETE_DONT_CLOSE; + new_f->fp.file._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.file._file._IO_file_flags = + _IO_mask_flags (&new_f->fp.file._file, read_write, _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); return (_IO_FILE *) &new_f->fp; |