summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libtrivfs/dir-readdir.c4
-rw-r--r--libtrivfs/file-get-trans.c9
-rw-r--r--libtrivfs/file-getfh.c8
-rw-r--r--libtrivfs/file-set-trans.c6
-rw-r--r--libtrivfs/fsys-getroot.c6
-rw-r--r--libtrivfs/fsys-stubs.c12
-rw-r--r--libtrivfs/io-restrict-auth.c18
7 files changed, 32 insertions, 31 deletions
diff --git a/libtrivfs/dir-readdir.c b/libtrivfs/dir-readdir.c
index eebfabc8..62108995 100644
--- a/libtrivfs/dir-readdir.c
+++ b/libtrivfs/dir-readdir.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1994, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1994,99, 2002 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -22,7 +22,7 @@ kern_return_t
trivfs_S_dir_readdir (struct trivfs_protid *cred,
mach_port_t reply, mach_msg_type_name_t reply_type,
char **data,
- u_int *datalen,
+ size_t *datalen,
boolean_t *data_dealloc,
int entry,
int nentries,
diff --git a/libtrivfs/file-get-trans.c b/libtrivfs/file-get-trans.c
index 15f5a003..6ae54b73 100644
--- a/libtrivfs/file-get-trans.c
+++ b/libtrivfs/file-get-trans.c
@@ -1,5 +1,5 @@
-/*
- Copyright (C) 1994 Free Software Foundation
+/*
+ Copyright (C) 1994,2002 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -20,8 +20,9 @@
kern_return_t
trivfs_S_file_get_translator (struct trivfs_protid *cred,
- mach_port_t reply, mach_msg_type_name_t reply_type,
- char **trans, u_int *translen)
+ mach_port_t reply,
+ mach_msg_type_name_t reply_type,
+ char **trans, size_t *translen)
{
return EOPNOTSUPP;
}
diff --git a/libtrivfs/file-getfh.c b/libtrivfs/file-getfh.c
index eeb9e3d1..f77f09cb 100644
--- a/libtrivfs/file-getfh.c
+++ b/libtrivfs/file-getfh.c
@@ -1,5 +1,5 @@
-/*
- Copyright (C) 1994 Free Software Foundation
+/*
+ Copyright (C) 1994,2002 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -19,9 +19,9 @@
#include "fs_S.h"
kern_return_t
-trivfs_S_file_getfh (struct trivfs_protid *cred,
+trivfs_S_file_getfh (struct trivfs_protid *cred,
mach_port_t reply, mach_msg_type_name_t reply_type,
- char **data, u_int *datalen)
+ char **data, size_t *datalen)
{
return EOPNOTSUPP;
}
diff --git a/libtrivfs/file-set-trans.c b/libtrivfs/file-set-trans.c
index 36e9bd21..49eeba83 100644
--- a/libtrivfs/file-set-trans.c
+++ b/libtrivfs/file-set-trans.c
@@ -1,5 +1,5 @@
-/*
- Copyright (C) 1994 Free Software Foundation
+/*
+ Copyright (C) 1994, 2002 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -25,7 +25,7 @@ trivfs_S_file_set_translator (struct trivfs_protid *cred,
int passflags,
int oldtransflags,
char *trans,
- u_int translen,
+ size_t translen,
mach_port_t existing)
{
return EOPNOTSUPP;
diff --git a/libtrivfs/fsys-getroot.c b/libtrivfs/fsys-getroot.c
index 90a93d13..cc9ff56e 100644
--- a/libtrivfs/fsys-getroot.c
+++ b/libtrivfs/fsys-getroot.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1993,94,95,97,99 Free Software Foundation, Inc.
+ Copyright (C) 1993,94,95,97,99,2002 Free Software Foundation, Inc.
This file is part of the GNU Hurd.
@@ -31,8 +31,8 @@ trivfs_S_fsys_getroot (struct trivfs_control *cntl,
mach_port_t reply_port,
mach_msg_type_name_t reply_port_type,
mach_port_t dotdot,
- uid_t *uids, u_int nuids,
- uid_t *gids, u_int ngids,
+ uid_t *uids, size_t nuids,
+ uid_t *gids, size_t ngids,
int flags,
retry_type *do_retry,
char *retry_name,
diff --git a/libtrivfs/fsys-stubs.c b/libtrivfs/fsys-stubs.c
index 4457b231..45c3bc08 100644
--- a/libtrivfs/fsys-stubs.c
+++ b/libtrivfs/fsys-stubs.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1994, 1995, 1996 Free Software Foundation
+ Copyright (C) 1994,95,96,2002 Free Software Foundation, Inc.
This file is part of the GNU Hurd.
@@ -8,7 +8,7 @@ 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,
+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.
@@ -29,7 +29,7 @@ trivfs_S_fsys_startup (mach_port_t bootport,
int flags,
mach_port_t cntl,
mach_port_t *realnode,
- mach_port_t *realnodetype)
+ mach_msg_type_name_t *realnodetype)
{
return EOPNOTSUPP;
}
@@ -60,11 +60,11 @@ trivfs_S_fsys_getfile (struct trivfs_control *cntl,
mach_port_t reply,
mach_msg_type_name_t replytype,
uid_t *genuids,
- u_int ngenuids,
+ size_t ngenuids,
uid_t *gengids,
- u_int ngengids,
+ size_t ngengids,
char *handle,
- u_int handlesize,
+ size_t handlesize,
mach_port_t *file,
mach_msg_type_name_t *filetype)
{
diff --git a/libtrivfs/io-restrict-auth.c b/libtrivfs/io-restrict-auth.c
index 9ff6168e..b9a0598d 100644
--- a/libtrivfs/io-restrict-auth.c
+++ b/libtrivfs/io-restrict-auth.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1993,94,95,96,2001 Free Software Foundation
+ Copyright (C) 1993,94,95,96,2001,02 Free Software Foundation, Inc.
This file is part of the GNU Hurd.
@@ -8,7 +8,7 @@ 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,
+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.
@@ -40,18 +40,18 @@ trivfs_S_io_restrict_auth (struct trivfs_protid *cred,
mach_msg_type_name_t replytype,
mach_port_t *newport,
mach_msg_type_name_t *newporttype,
- uid_t *uids, u_int nuids,
- uid_t *gids, u_int ngids)
+ uid_t *uids, size_t nuids,
+ uid_t *gids, size_t ngids)
{
int i;
error_t err;
struct trivfs_protid *newcred;
struct idvec *uvec, *gvec;
struct iouser *user;
-
+
if (!cred)
return EOPNOTSUPP;
-
+
if (cred->isroot)
/* CRED has root access, and so may use any ids. */
{
@@ -101,7 +101,7 @@ trivfs_S_io_restrict_auth (struct trivfs_protid *cred,
err = ports_create_port (cred->po->cntl->protid_class,
cred->po->cntl->protid_bucket,
- sizeof (struct trivfs_protid),
+ sizeof (struct trivfs_protid),
&newcred);
if (err)
{
@@ -119,8 +119,8 @@ trivfs_S_io_restrict_auth (struct trivfs_protid *cred,
newcred->user = user;
newcred->hook = cred->hook;
- err = io_restrict_auth (cred->realnode, &newcred->realnode,
- user->uids->ids, user->uids->num,
+ err = io_restrict_auth (cred->realnode, &newcred->realnode,
+ user->uids->ids, user->uids->num,
user->gids->ids, user->gids->num);
if (!err && trivfs_protid_create_hook)
{