diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:26:46 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:26:46 +0000 |
| commit | df6d86d8822458cf787b5f5620490d6a962da3b8 (patch) | |
| tree | 8d499fa24a32a195bd6e384dfb70639c45c4a9bb /libio/iovdprintf.c | |
| parent | 2c7242b971fd7b63fa842df15ec6fa3d0ff8aeb0 (diff) | |
| parent | 1949a12d5da678a8532359a95717d8e63910d93b (diff) | |
Merge commit 'refs/top-bases/t/____longjmp_chk' into t/____longjmp_chkt/____longjmp_chk
Diffstat (limited to 'libio/iovdprintf.c')
| -rw-r--r-- | libio/iovdprintf.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libio/iovdprintf.c b/libio/iovdprintf.c index 8ca55fccae..78a3a2bd15 100644 --- a/libio/iovdprintf.c +++ b/libio/iovdprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2016 Free Software Foundation, Inc. +/* Copyright (C) 1995-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 @@ -28,7 +28,7 @@ #include <stdio_ext.h> int -_IO_vdprintf (int d, const char *format, _IO_va_list arg) +_IO_vdprintf (int d, const char *format, va_list arg) { struct _IO_FILE_plus tmpfil; struct _IO_wide_data wd; @@ -39,10 +39,7 @@ _IO_vdprintf (int d, const char *format, _IO_va_list arg) #endif _IO_no_init (&tmpfil.file, _IO_USER_LOCK, 0, &wd, &_IO_wfile_jumps); _IO_JUMPS (&tmpfil) = &_IO_file_jumps; - _IO_file_init (&tmpfil); -#if !_IO_UNIFIED_JUMPTABLES - tmpfil.vtable = NULL; -#endif + _IO_new_file_init_internal (&tmpfil); if (_IO_file_attach (&tmpfil.file, d) == NULL) { _IO_un_link (&tmpfil); |