summaryrefslogtreecommitdiff
path: root/hurd
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-10 14:34:15 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-10 14:34:15 -0400
commit3ce1f2959437e952b9db4eaeed2407424f11a4d1 (patch)
treedb47da854c7d3bfc2c3bce4c6fc8381075ac9ec4 /hurd
parent1248c1c41508387ff282b208636737e8cdc9b5b0 (diff)
downloadglibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.gz
Cleanup of configuration options
Make several tool features mandatory and simplify the code.
Diffstat (limited to 'hurd')
-rw-r--r--hurd/fopenport.c10
-rw-r--r--hurd/vpprintf.c27
2 files changed, 3 insertions, 34 deletions
diff --git a/hurd/fopenport.c b/hurd/fopenport.c
index 5dcb5ab30a..d01b9f3f35 100644
--- a/hurd/fopenport.c
+++ b/hurd/fopenport.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994,95,97,2000,01,02 Free Software Foundation, Inc.
+/* Copyright (C) 1994,1995,1997,2000-2002,2011 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
@@ -63,11 +63,7 @@ writeio (void *cookie, const char *buf, size_t n)
Returns zero if successful, nonzero if not. */
static int
seekio (void *cookie,
-#ifdef USE_IN_LIBIO
_IO_off64_t *pos,
-#else
- fpos_t *pos,
-#endif
int whence)
{
error_t err = __io_seek ((file_t) cookie, *pos, whence, pos);
@@ -86,12 +82,8 @@ closeio (void *cookie)
return 0;
}
-#ifdef USE_IN_LIBIO
#include "../libio/libioP.h"
#define fopencookie _IO_fopencookie
-#else
-#define cookie_io_functions_t __io_functions
-#endif
static const cookie_io_functions_t funcsio =
{ readio, writeio, seekio, closeio };
diff --git a/hurd/vpprintf.c b/hurd/vpprintf.c
index 7967998163..0b09df34d8 100644
--- a/hurd/vpprintf.c
+++ b/hurd/vpprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,94,97,2000,01 Free Software Foundation, Inc.
+/* Copyright (C) 1991,94,97,2000,01,11 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
@@ -21,9 +21,7 @@
#include <string.h>
#include <hurd.h>
-#ifdef USE_IN_LIBIO
-# include <libioP.h>
-#endif
+#include <libioP.h>
static ssize_t
do_write (void *cookie, const char *buf, size_t n)
@@ -42,8 +40,6 @@ vpprintf (io_t port, const char *format, va_list arg)
{
int done;
-#ifdef USE_IN_LIBIO
-
struct locked_FILE
{
struct _IO_cookie_file cfile;
@@ -60,24 +56,5 @@ vpprintf (io_t port, const char *format, va_list arg)
done = _IO_vfprintf (&temp_f.cfile.__fp.file, format, arg);
-#else
-
- FILE f;
-
- /* Create an unbuffered stream talking to PORT on the stack. */
- memset ((void *) &f, 0, sizeof (f));
- f.__magic = _IOMAGIC;
- f.__mode.__write = 1;
- f.__cookie = (void *) port;
- f.__room_funcs = __default_room_functions;
- f.__io_funcs.__write = do_write;
- f.__seen = 1;
- f.__userbuf = 1;
-
- /* vfprintf will use a buffer on the stack for the life of the call. */
- done = vfprintf (&f, format, arg);
-
-#endif
-
return done;
}