diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:06:20 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:06:58 +0000 |
| commit | 3fcbb67b7949a8b362de5558bf1c6dd7ec5d21cf (patch) | |
| tree | b867f9a6d3426f212b2f073bef8067a830f13022 /libio/oldiofopen.c | |
| parent | b6df7ac2cbe11e6a72f2ab7bd35c6130b72d21d9 (diff) | |
| parent | cab56836b146bc129f1ad43f0393d95a9deca63a (diff) | |
Merge commit 'refs/top-bases/t/tls-threadvar' into t/tls-threadvar
Diffstat (limited to 'libio/oldiofopen.c')
| -rw-r--r-- | libio/oldiofopen.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libio/oldiofopen.c b/libio/oldiofopen.c index cc7c34282c..f0a67104fb 100644 --- a/libio/oldiofopen.c +++ b/libio/oldiofopen.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 @@ -32,7 +32,7 @@ #include <stdlib.h> -_IO_FILE * +FILE * attribute_compat_text_section _IO_old_fopen (const char *filename, const char *mode) { @@ -51,12 +51,9 @@ _IO_old_fopen (const char *filename, const char *mode) #endif _IO_old_init (&new_f->fp.file._file, 0); _IO_JUMPS_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_fopen ((_IO_FILE *) &new_f->fp, filename, mode) != NULL) - return (_IO_FILE *) &new_f->fp; + _IO_old_file_init_internal ((struct _IO_FILE_plus *) &new_f->fp); + if (_IO_old_file_fopen ((FILE *) &new_f->fp, filename, mode) != NULL) + return (FILE *) &new_f->fp; _IO_un_link ((struct _IO_FILE_plus *) &new_f->fp); free (new_f); return NULL; |