diff options
Diffstat (limited to 'libtrivfs')
| -rw-r--r-- | libtrivfs/ChangeLog | 7 | ||||
| -rw-r--r-- | libtrivfs/Makefile | 3 | ||||
| -rw-r--r-- | libtrivfs/io-map-segment.c | 37 | ||||
| -rw-r--r-- | libtrivfs/io-map.c | 6 |
4 files changed, 10 insertions, 43 deletions
diff --git a/libtrivfs/ChangeLog b/libtrivfs/ChangeLog index 3ab17d40..f1e714bc 100644 --- a/libtrivfs/ChangeLog +++ b/libtrivfs/ChangeLog @@ -1,3 +1,8 @@ +1999-09-13 Roland McGrath <roland@baalperazim.frob.com> + + * Makefile, io-map.c, io-map-segment.c: Reverted changes related to + io_map_segment. + 1999-09-07 Thomas Bushnell, BSG <tb@mit.edu> * io-map-segment.c (trivfs_S_io_map): New file. @@ -11,7 +16,7 @@ Mon Mar 15 14:36:33 1999 Thomas Bushnell, BSG <tb@mit.edu> the proper value. (trivfs_begin_using_control): Likewise. Reported by Mark Kettenis (kettenis@wins.uva.nl). - + 1999-02-06 Mark Kettenis <kettenis@gnu.org> * trivfs.h (trivfs_check_access_hook): New variable. diff --git a/libtrivfs/Makefile b/libtrivfs/Makefile index 940496dd..58322c15 100644 --- a/libtrivfs/Makefile +++ b/libtrivfs/Makefile @@ -31,8 +31,7 @@ IOSRCS=io-async-icky.c io-async.c io-duplicate.c io-map.c io-modes-get.c \ io-modes-off.c io-modes-on.c io-modes-set.c io-owner-get.c \ io-owner-mod.c io-pathconf.c io-read.c io-readable.c io-revoke.c \ io-reauthenticate.c io-restrict-auth.c io-seek.c io-select.c \ - io-stat.c io-stubs.c io-write.c io-version.c io-identity.c \ - io-map-segment.c + io-stat.c io-stubs.c io-write.c io-version.c io-identity.c FSYSSRCS=fsys-getroot.c fsys-goaway.c fsys-stubs.c fsys-syncfs.c \ fsys-forward.c fsys-set-options.c fsys-get-options.c diff --git a/libtrivfs/io-map-segment.c b/libtrivfs/io-map-segment.c deleted file mode 100644 index 9386aca2..00000000 --- a/libtrivfs/io-map-segment.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - Copyright (C) 1999 Free Software Foundation, Inc. - Written by Thomas Bushnell, BSG. - - This file is part of the GNU Hurd. - - The GNU Hurd is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2, or (at - your option) any later version. - - The GNU Hurd 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 - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ - -#include "priv.h" -#include "io_S.h" -#include <assert.h> - -kern_return_t -trivfs_S_io_map_segment (struct trivfs_protid *cred, - mach_port_t reply, - mach_msg_type_name_t replytype, - int index, - mach_port_t *rdobj, - mach_msg_type_name_t *rdtype, - mach_port_t *wrobj, - mach_msg_type_name_t *wrtype) -{ - assert (!trivfs_support_read && !trivfs_support_write); - return EOPNOTSUPP; -} diff --git a/libtrivfs/io-map.c b/libtrivfs/io-map.c index 958b53cf..f94bf8a5 100644 --- a/libtrivfs/io-map.c +++ b/libtrivfs/io-map.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1993, 1994, 1999 Free Software Foundation + Copyright (C) 1993, 1994 Free Software Foundation This file is part of the GNU Hurd. @@ -32,6 +32,6 @@ trivfs_S_io_map (struct trivfs_protid *cred, mach_port_t *wrobj, mach_msg_type_name_t *wrtype) { - return trivfs_S_io_map_segment (cred, 0, reply, replytype, - rdobj, rdtype, wrobj, wrtype); + assert (!trivfs_support_read && !trivfs_support_write); + return EOPNOTSUPP; } |