From 20e078293697dd99ddcf2c2151c9f075409cc185 Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Tue, 15 Apr 2014 18:38:08 +0200 Subject: Include the MIG-generated server header files This enables the compiler to check that the server function declarations match MIGs expectations. Fix a few oddities along the way. * console-client/trans.c: Include MIG-generated server header file(s). * console/console.c: Likewise. Also, fix declarations. * console/mutations.h (TIOCTL_IMPORTS): Just use libnetfs/priv.h. * console/priv.h: Delete now unused file. * ext2fs/storeinfo.c: Include MIG-generated server header file(s). * fatfs/inode.c: Likewise. * fatfs/main.c: Likewise. Also, fix declaration. * isofs/inode.c: Likewise. * libdiskfs/boot-start.c: Likewise. * libdiskfs/file-chg.c: Include the correct MIG-generated server header file. * libdiskfs/file-chmod.c: Include MIG-generated server header file(s). * libdiskfs/file-get-fs-opts.c: Likewise. * libdiskfs/init-startup.c: Likewise. * libnetfs/file-get-children.c: Likewise. * libnetfs/file-getcontrol.c: Include the correct MIG-generated server header file. * libnetfs/file-set-translator.c: Include MIG-generated server header file(s). * libnetfs/fsstubs.c: Likewise. * libtrivfs/file-access.c: Likewise. * libtrivfs/file-chauthor.c: Likewise. * libtrivfs/file-chflags.c: Likewise. * libtrivfs/file-chg.c: Likewise. * libtrivfs/file-chmod.c: Likewise. * libtrivfs/file-chown.c: Likewise. * libtrivfs/file-exec.c: Likewise. * libtrivfs/file-get-children.c: Likewise. * libtrivfs/file-get-fs-options.c: Likewise. * libtrivfs/file-get-source.c: Likewise. * libtrivfs/file-get-storage-info.c: Likewise. * libtrivfs/file-get-trans.c: Likewise. * libtrivfs/file-get-transcntl.c: Likewise. * libtrivfs/file-getcontrol.c: Likewise. * libtrivfs/file-getfh.c: Likewise. * libtrivfs/file-getlinknode.c: Likewise. * libtrivfs/file-lock.c: Likewise. * libtrivfs/file-reparent.c: Likewise. * libtrivfs/file-set-size.c: Likewise. * libtrivfs/file-set-trans.c: Likewise. * libtrivfs/file-statfs.c: Likewise. * libtrivfs/file-sync.c: Likewise. * libtrivfs/file-syncfs.c: Likewise. * libtrivfs/file-utimes.c: Likewise. * libtrivfs/fsys-forward.c: Likewise. * libtrivfs/fsys-get-options.c: Likewise. * libtrivfs/fsys-getroot.c: Likewise. * libtrivfs/fsys-goaway.c: Likewise. * libtrivfs/fsys-set-options.c: Likewise. * libtrivfs/fsys-stubs.c: Likewise. * libtrivfs/fsys-syncfs.c: Likewise. * libtrivfs/io-async-icky.c: Likewise. * libtrivfs/io-async.c: Likewise. * libtrivfs/io-duplicate.c: Likewise. * libtrivfs/io-identity.c: Likewise. * libtrivfs/io-map.c: Likewise. * libtrivfs/io-modes-get.c: Likewise. * libtrivfs/io-modes-off.c: Likewise. * libtrivfs/io-modes-on.c: Likewise. * libtrivfs/io-modes-set.c: Likewise. * libtrivfs/io-owner-get.c: Likewise. * libtrivfs/io-owner-mod.c: Likewise. * libtrivfs/io-pathconf.c: Likewise. * libtrivfs/io-read.c: Likewise. * libtrivfs/io-readable.c: Likewise. * libtrivfs/io-reauthenticate.c: Likewise. * libtrivfs/io-restrict-auth.c: Likewise. * libtrivfs/io-revoke.c: Likewise. * libtrivfs/io-seek.c: Likewise. * libtrivfs/io-select.c: Likewise. * libtrivfs/io-stat.c: Likewise. * libtrivfs/io-stubs.c: Likewise. * libtrivfs/io-version.c: Likewise. * libtrivfs/io-write.c: Likewise. * pfinet/tunnel.c: Likewise. * storeio/io.c: Likewise. * storeio/storeio.c: Likewise. * term/users.c: Likewise. * tmpfs/node.c: Likewise. * trans/fakeroot.c: Likewise. Also, include all server headers that provide the X_server_routine functions... (netfs_demuxer): ... that were previously declared here. * trans/fifo.c: Include MIG-generated server header file(s). * trans/firmlink.c: Likewise. * trans/hello-mt.c: Likewise. * trans/hello.c: Likewise. * trans/magic.c: Likewise. * trans/mtab.c: Likewise. * trans/new-fifo.c: Likewise. * trans/null.c: Likewise. * trans/proxy-defpager.c: Likewise. * trans/streamio.c: Likewise. * libdiskfs/fsmutations.h: Qualify the import with the libraries path. Without this change, out-of-tree builds would no longer work. * libnetfs/mutations.h: Likewise. * libtrivfs/mig-mutate.h: Likewise. --- console/console.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) (limited to 'console/console.c') diff --git a/console/console.c b/console/console.c index 0577ea04..57ae8133 100644 --- a/console/console.c +++ b/console/console.c @@ -48,6 +48,9 @@ #include "input.h" #include "fs_notify_U.h" +#include "libnetfs/fs_S.h" +#include "libnetfs/io_S.h" +#include "tioctl_S.h" const char *argp_program_version = STANDARD_HURD_VERSION (console); @@ -1815,98 +1818,101 @@ S_tioctl_tiocgpgrp (struct protid *cred, int *pgrp) } kern_return_t -S_tioctl_tiocmodg (io_t port, int *state) +S_tioctl_tiocmodg (struct protid *cred, int *state) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocmods (io_t port, int state) +S_tioctl_tiocmods (struct protid *cred, int state) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocexcl (io_t port) +S_tioctl_tiocexcl (struct protid *cred) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocnxcl (io_t port) +S_tioctl_tiocnxcl (struct protid *cred) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocgeta (io_t port, tcflag_t *modes, cc_t *ccs, speed_t *speeds) +S_tioctl_tiocgeta (struct protid *cred, tcflag_t *modes, cc_t *ccs, + speed_t *speeds) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocseta (io_t port, tcflag_t *modes, cc_t *ccs, speed_t *speeds) +S_tioctl_tiocseta (struct protid *cred, tcflag_t *modes, cc_t *ccs, + speed_t *speeds) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocsetaw (io_t port, tcflag_t *modes, cc_t *ccs, speed_t *speeds) +S_tioctl_tiocsetaw (struct protid *cred, tcflag_t *modes, cc_t *ccs, + speed_t *speeds) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocsetaf (io_t port, tcflag_t *modes, cc_t *ccs, - speed_t *speeds) +S_tioctl_tiocsetaf (struct protid *cred, tcflag_t *modes, cc_t *ccs, + speed_t *speeds) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocgetd (io_t port, int *disc) +S_tioctl_tiocgetd (struct protid *cred, int *disc) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocsetd (io_t port, int disc) +S_tioctl_tiocsetd (struct protid *cred, int disc) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocdrain (io_t port) +S_tioctl_tiocdrain (struct protid *cred) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocmget (io_t port, int *bits) +S_tioctl_tiocmget (struct protid *cred, int *bits) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocmset (io_t port, int bits) +S_tioctl_tiocmset (struct protid *cred, int bits) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocsig (io_t port, int sig) +S_tioctl_tiocsig (struct protid *cred, int sig) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocext (io_t port, int mode) +S_tioctl_tiocext (struct protid *cred, int mode) { return EOPNOTSUPP; } kern_return_t -S_tioctl_tiocucntl (io_t port, int mode) +S_tioctl_tiocucntl (struct protid *cred, int mode) { return EOPNOTSUPP; -- cgit v1.2.3