diff options
| -rw-r--r-- | libdiskfs/diskfs.h | 6 | ||||
| -rw-r--r-- | libdiskfs/file-exec.c | 14 | ||||
| -rw-r--r-- | libdiskfs/file-get-fs-opts.c | 7 | ||||
| -rw-r--r-- | libdiskfs/file-getfh.c | 4 | ||||
| -rw-r--r-- | libdiskfs/file-set-trans.c | 4 | ||||
| -rw-r--r-- | libdiskfs/io-restrict-auth.c | 4 | ||||
| -rw-r--r-- | libdiskfs/opts-append-std.c | 4 | ||||
| -rw-r--r-- | libdiskfs/opts-get.c | 7 |
8 files changed, 24 insertions, 26 deletions
diff --git a/libdiskfs/diskfs.h b/libdiskfs/diskfs.h index 46be9446..42c63549 100644 --- a/libdiskfs/diskfs.h +++ b/libdiskfs/diskfs.h @@ -376,7 +376,7 @@ error_t diskfs_drop_dirstat (struct node *dp, struct dirstat *ds); then there is no limit on *DATACNT; if N is -1, then there is no limit on AMT. */ error_t diskfs_get_directs (struct node *dp, int entry, int n, - char **data, u_int *datacnt, + char **data, size_t *datacnt, vm_size_t bufsiz, int *amt); /* The user must define this function. For locked node NP (for which @@ -900,7 +900,7 @@ error_t diskfs_set_options (const char *argz, size_t argz_len); /* Append to the malloced string *ARGZ of length *ARGZ_LEN a NUL-separated list of the arguments to this translator. The default definition of this routine simply calls diskfs_append_std_options. */ -error_t diskfs_append_args (char **argz, unsigned *argz_len); +error_t diskfs_append_args (char **argz, size_t *argz_len); /* If this is defined or set to an argp structure, it will be used by the default diskfs_set_options to handle runtime option parsing. The default @@ -927,7 +927,7 @@ extern const struct argp diskfs_store_startup_argp; /* *Appends* to ARGZ & ARGZ_LEN '\0'-separated options describing the standard diskfs option state (note that unlike diskfs_get_options, ARGZ & ARGZ_LEN must already have a sane value). */ -error_t diskfs_append_std_options (char **argz, unsigned *argz_len); +error_t diskfs_append_std_options (char **argz, size_t *argz_len); /* Demultiplex incoming messages on ports created by libdiskfs. */ int diskfs_demuxer (mach_msg_header_t *, mach_msg_header_t *); diff --git a/libdiskfs/file-exec.c b/libdiskfs/file-exec.c index 2fd60415..452240c0 100644 --- a/libdiskfs/file-exec.c +++ b/libdiskfs/file-exec.c @@ -33,19 +33,19 @@ diskfs_S_file_exec (struct protid *cred, task_t task, int flags, char *argv, - u_int argvlen, + size_t argvlen, char *envp, - u_int envplen, + size_t envplen, mach_port_t *fds, - u_int fdslen, + size_t fdslen, mach_port_t *portarray, - u_int portarraylen, + size_t portarraylen, int *intarray, - u_int intarraylen, + size_t intarraylen, mach_port_t *deallocnames, - u_int deallocnameslen, + size_t deallocnameslen, mach_port_t *destroynames, - u_int destroynameslen) + size_t destroynameslen) { struct node *np; uid_t uid; diff --git a/libdiskfs/file-get-fs-opts.c b/libdiskfs/file-get-fs-opts.c index 9ce2eedb..b3bca821 100644 --- a/libdiskfs/file-get-fs-opts.c +++ b/libdiskfs/file-get-fs-opts.c @@ -1,8 +1,7 @@ /* Get run-time file system options - Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc. - - Written by Miles Bader <miles@gnu.ai.mit.edu> + Copyright (C) 1995,96,98,2002 Free Software Foundation, Inc. + Written by Miles Bader <miles@gnu.org> This file is part of the GNU Hurd. @@ -27,7 +26,7 @@ error_t diskfs_S_file_get_fs_options (struct protid *cred, - char **data, unsigned *data_len) + char **data, size_t *data_len) { error_t err; char *argz = 0; diff --git a/libdiskfs/file-getfh.c b/libdiskfs/file-getfh.c index 65029c1a..2dcf68e5 100644 --- a/libdiskfs/file-getfh.c +++ b/libdiskfs/file-getfh.c @@ -1,6 +1,6 @@ /* Return a file handle (for nfs server support) - Copyright (C) 1997, 1999 Free Software Foundation + Copyright (C) 1997,99,2002 Free Software Foundation, Inc. This file is part of the GNU Hurd. @@ -26,7 +26,7 @@ /* Return an NFS file handle for CRED in FH & FN_LEN. */ error_t -diskfs_S_file_getfh (struct protid *cred, char **fh, unsigned *fh_len) +diskfs_S_file_getfh (struct protid *cred, char **fh, size_t *fh_len) { struct node *node; union diskfs_fhandle *f; diff --git a/libdiskfs/file-set-trans.c b/libdiskfs/file-set-trans.c index c123ad39..26a19eb4 100644 --- a/libdiskfs/file-set-trans.c +++ b/libdiskfs/file-set-trans.c @@ -1,5 +1,5 @@ /* libdiskfs implementation of fs.defs: file_set_translator - Copyright (C) 1992,93,94,95,96,99,2001 Free Software Foundation, Inc. + Copyright (C) 1992,93,94,95,96,99,2001,02 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 @@ -27,7 +27,7 @@ diskfs_S_file_set_translator (struct protid *cred, int active_flags, int killtrans_flags, char *passive, - u_int passivelen, + size_t passivelen, fsys_t active) { struct node *np; diff --git a/libdiskfs/io-restrict-auth.c b/libdiskfs/io-restrict-auth.c index d5533e61..c1560ac1 100644 --- a/libdiskfs/io-restrict-auth.c +++ b/libdiskfs/io-restrict-auth.c @@ -25,9 +25,9 @@ diskfs_S_io_restrict_auth (struct protid *cred, mach_port_t *newport, mach_msg_type_name_t *newportpoly, uid_t *uids, - u_int nuids, + size_t nuids, gid_t *gids, - u_int ngids) + size_t ngids) { error_t err; struct iouser *user; diff --git a/libdiskfs/opts-append-std.c b/libdiskfs/opts-append-std.c index 5eaf6cb8..b951bf93 100644 --- a/libdiskfs/opts-append-std.c +++ b/libdiskfs/opts-append-std.c @@ -1,6 +1,6 @@ /* Get standard diskfs run-time options - Copyright (C) 1995, 96,97,98,99 Free Software Foundation, Inc. + Copyright (C) 1995, 96,97,98,99,2002 Free Software Foundation, Inc. Written by Miles Bader <miles@gnu.org> @@ -26,7 +26,7 @@ #include "priv.h" error_t -diskfs_append_std_options (char **argz, unsigned *argz_len) +diskfs_append_std_options (char **argz, size_t *argz_len) { error_t err; extern int diskfs_sync_interval; diff --git a/libdiskfs/opts-get.c b/libdiskfs/opts-get.c index 91ec169b..c23e4bec 100644 --- a/libdiskfs/opts-get.c +++ b/libdiskfs/opts-get.c @@ -1,8 +1,7 @@ /* Get run-time options - Copyright (C) 1995, 1996 Free Software Foundation, Inc. - - Written by Miles Bader <miles@gnu.ai.mit.edu> + Copyright (C) 1995,96,2002 Free Software Foundation, Inc. + Written by Miles Bader <miles@gnu.org> This file is part of the GNU Hurd. @@ -23,7 +22,7 @@ #include "priv.h" error_t -diskfs_append_args (char **argz, unsigned *argz_len) +diskfs_append_args (char **argz, size_t *argz_len) { return diskfs_append_std_options (argz, argz_len); } |