*** empty log message ***

1 files changed, 2 insertions, 59 deletions

diff --git a/sysdeps/mach/hurd/vdprintf.c b/sysdeps/mach/hurd/vdprintf.c
index a69607e..415258c 100644
--- a/sysdeps/mach/hurd/vdprintf.c
+++ b/sysdeps/mach/hurd/vdprintf.c
@@ -33,71 +33,14 @@ vdprintf (int d, const char *format, va_list arg)
   struct hurd_fd *fd;
 
   HURD_CRITICAL_BEGIN;
-  fd = _hurd_fd_get (fd);
+  fd = _hurd_fd_get (d);
   HURD_CRITICAL_END;
 
   if (!fd)
     return 0;
 
   /* Create an unbuffered stream talking to D on the stack.  */
-  memset ((PTR) &f, 0, sizeof(f));
-  f.__magic = _IOMAGIC;
-  f.__mode.__write = 1;
-  f.__cookie = fd;
-  f.__room_funcs = __default_room_functions;
-  f.__io_funcs = __default_io_functions;
-  f.__seen = 1;
-  f.__userbuf = 1;
-
-  /* vfprintf will use a buffer on the stack for the life of the call,
-     and flush it when finished.  */
-  done = vfprintf (&f, format, arg);
-
-  return done;
-}
-/* Copyright (C) 1991, 1992, 1993, 1997 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
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
-
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
-
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <hurd/fd.h>
-
-/* Write formatted output to file descriptor D according to the format string
-   FORMAT, using the argument list in ARG.  */
-int
-vdprintf (int d, const char *format, va_list arg)
-{
-  int done;
-  FILE f;
-  struct hurd_fd *fd;
-
-  HURD_CRITICAL_BEGIN;
-  fd = _hurd_fd_get (fd);
-  HURD_CRITICAL_END;
-
-  if (!fd)
-    return 0;
-
-  /* Create an unbuffered stream talking to D on the stack.  */
-  memset ((PTR) &f, 0, sizeof(f));
+  memset ((void *) &f, 0, sizeof(f));
   f.__magic = _IOMAGIC;
   f.__mode.__write = 1;
   f.__cookie = fd;