summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libdiskfs/dir-readdir.c4
-rw-r--r--libdiskfs/file-get-trans.c8
-rw-r--r--libdiskfs/fsys-getroot.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/libdiskfs/dir-readdir.c b/libdiskfs/dir-readdir.c
index d1dc4490..d2f9d750 100644
--- a/libdiskfs/dir-readdir.c
+++ b/libdiskfs/dir-readdir.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1993,94,96,99 Free Software Foundation, Inc.
+ Copyright (C) 1993,94,96,99,2002 Free Software Foundation, Inc.
This file is part of the GNU Hurd.
@@ -26,7 +26,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
kern_return_t
diskfs_S_dir_readdir (struct protid *cred,
char **data,
- u_int *datacnt,
+ size_t *datacnt,
boolean_t *data_dealloc,
int entry,
int nentries,
diff --git a/libdiskfs/file-get-trans.c b/libdiskfs/file-get-trans.c
index 118222be..e77dba82 100644
--- a/libdiskfs/file-get-trans.c
+++ b/libdiskfs/file-get-trans.c
@@ -1,5 +1,5 @@
/* libdiskfs implementation of fs.defs: file_get_translator
- Copyright (C) 1992,93,94,95,96,98,99 Free Software Foundation, Inc.
+ Copyright (C) 1992,93,94,95,96,98,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
@@ -25,7 +25,7 @@
kern_return_t
diskfs_S_file_get_translator (struct protid *cred,
char **trans,
- u_int *translen)
+ size_t *translen)
{
struct node *np;
error_t error = 0;
@@ -41,7 +41,7 @@ diskfs_S_file_get_translator (struct protid *cred,
if (S_ISLNK (np->dn_stat.st_mode))
{
unsigned int len = sizeof _HURD_SYMLINK + np->dn_stat.st_size + 1;
- int amt;
+ size_t amt;
assert (diskfs_shortcut_symlink);
if (len > *translen)
*trans = mmap (0, len, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
@@ -107,7 +107,7 @@ diskfs_S_file_get_translator (struct protid *cred,
len = sizeof _HURD_IFSOCK;
if (len > *translen)
- *trans = mmap (0, len, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
+ *trans = mmap (0, len, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
bcopy (_HURD_IFSOCK, *trans, sizeof _HURD_IFSOCK);
*translen = len;
error = 0;
diff --git a/libdiskfs/fsys-getroot.c b/libdiskfs/fsys-getroot.c
index 5a5b902a..54ba0a58 100644
--- a/libdiskfs/fsys-getroot.c
+++ b/libdiskfs/fsys-getroot.c
@@ -31,9 +31,9 @@ diskfs_S_fsys_getroot (fsys_t controlport,
mach_msg_type_name_t replytype,
mach_port_t dotdot,
uid_t *uids,
- u_int nuids,
+ size_t nuids,
uid_t *gids,
- u_int ngids,
+ size_t ngids,
int flags,
retry_type *retry,
char *retryname,
@@ -101,7 +101,7 @@ diskfs_S_fsys_getroot (fsys_t controlport,
{
/* Handle symlink interpretation */
char pathbuf[diskfs_root_node->dn_stat.st_size + 1];
- int amt;
+ size_t amt;
if (diskfs_read_symlink_hook)
error = (*diskfs_read_symlink_hook) (diskfs_root_node, pathbuf);