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. --- libnetfs/file-get-children.c | 1 + libnetfs/file-getcontrol.c | 2 +- libnetfs/file-set-translator.c | 1 + libnetfs/fsstubs.c | 1 + libnetfs/mutations.h | 8 ++++---- 5 files changed, 8 insertions(+), 5 deletions(-) (limited to 'libnetfs') diff --git a/libnetfs/file-get-children.c b/libnetfs/file-get-children.c index 80a727f5..bd7e8fcf 100644 --- a/libnetfs/file-get-children.c +++ b/libnetfs/file-get-children.c @@ -20,6 +20,7 @@ along with the GNU Hurd. If not, see . */ #include "priv.h" +#include "fs_S.h" #include diff --git a/libnetfs/file-getcontrol.c b/libnetfs/file-getcontrol.c index 50401f86..0e29ccf9 100644 --- a/libnetfs/file-getcontrol.c +++ b/libnetfs/file-getcontrol.c @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ #include "netfs.h" -#include "fsys_S.h" +#include "fs_S.h" #include error_t diff --git a/libnetfs/file-set-translator.c b/libnetfs/file-set-translator.c index b46eb029..02c55836 100644 --- a/libnetfs/file-set-translator.c +++ b/libnetfs/file-set-translator.c @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ #include "netfs.h" +#include "fs_S.h" #include #include diff --git a/libnetfs/fsstubs.c b/libnetfs/fsstubs.c index f1b9bf7e..75bd7903 100644 --- a/libnetfs/fsstubs.c +++ b/libnetfs/fsstubs.c @@ -21,6 +21,7 @@ #include "netfs.h" #include "fs_S.h" +#include "ifsock_S.h" error_t netfs_S_file_notice_changes (struct protid *user, diff --git a/libnetfs/mutations.h b/libnetfs/mutations.h index 51ca871a..e60a2208 100644 --- a/libnetfs/mutations.h +++ b/libnetfs/mutations.h @@ -31,7 +31,7 @@ #define FSYS_INTRAN control_t begin_using_control_port (fsys_t) #define FSYS_DESTRUCTOR end_using_control_port (control_t) -#define FILE_IMPORTS import "netfs.h"; import "priv.h"; -#define IO_IMPORTS import "netfs.h"; import "priv.h"; -#define FSYS_IMPORTS import "netfs.h"; import "priv.h"; -#define IFSOCK_IMPORTS import "netfs.h"; import "priv.h"; +#define FILE_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h"; +#define IO_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h"; +#define FSYS_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h"; +#define IFSOCK_IMPORTS import "libnetfs/netfs.h"; import "libnetfs/priv.h"; -- cgit v1.2.3