Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / libio / oldiopopen.c

diff --git a/libio/oldiopopen.c b/libio/oldiopopen.c
index 7bde3b52c9a967f272238f309715a8d2e0049ffb..af7774ae90c26680348a53e49db55992e7d9659a 100644 (file)
--- a/libio/oldiopopen.c
+++ b/libio/oldiopopen.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998-2014 Free Software Foundation, Inc.
+/* Copyright (C) 1998-2017 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Per Bothner <bothner@cygnus.com>.
 
@@ -115,10 +115,7 @@ unlock (void *not_used)
 
 _IO_FILE *
 attribute_compat_text_section
-_IO_old_proc_open (fp, command, mode)
-     _IO_FILE *fp;
-     const char *command;
-     const char *mode;
+_IO_old_proc_open (_IO_FILE *fp, const char *command, const char *mode)
 {
   volatile int read_or_write;
   volatile int parent_end, child_end;
@@ -194,9 +191,7 @@ _IO_old_proc_open (fp, command, mode)
 
 _IO_FILE *
 attribute_compat_text_section
-_IO_old_popen (command, mode)
-     const char *command;
-     const char *mode;
+_IO_old_popen (const char *command, const char *mode)
 {
   struct locked_FILE
   {
@@ -215,8 +210,8 @@ _IO_old_popen (command, mode)
 #endif
   fp = &new_f->fpx.file.file._file;
   _IO_old_init (fp, 0);
-  _IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fpx.file) = &_IO_old_proc_jumps;
-  _IO_old_file_init ((struct _IO_FILE_plus *) &new_f->fpx.file);
+  _IO_JUMPS_FILE_plus (&new_f->fpx.file) = &_IO_old_proc_jumps;
+  _IO_old_file_init_internal ((struct _IO_FILE_plus *) &new_f->fpx.file);
 #if  !_IO_UNIFIED_JUMPTABLES
   new_f->fpx.file.vtable = NULL;
 #endif
@@ -229,8 +224,7 @@ _IO_old_popen (command, mode)
 
 int
 attribute_compat_text_section
-_IO_old_proc_close (fp)
-     _IO_FILE *fp;
+_IO_old_proc_close (_IO_FILE *fp)
 {
   /* This is not name-space clean. FIXME! */
   int wstatus;
@@ -273,7 +267,7 @@ _IO_old_proc_close (fp)
   return wstatus;
 }
 
-const struct _IO_jump_t _IO_old_proc_jumps = {
+const struct _IO_jump_t _IO_old_proc_jumps libio_vtable = {
   JUMP_INIT_DUMMY,
   JUMP_INIT(finish, _IO_old_file_finish),
   JUMP_INIT(overflow, _IO_old_file_overflow),