From 9bd09e059b715971c804e7ee406fbfa1cde25a7e Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Wed, 8 May 2002 09:29:13 +0000
Subject: 2002-05-07 Roland McGrath <roland@frob.com>
* loop.c (server_loop): size_t -> socklen_t
* cache.c (fh_hash): int -> intptr_t
---
nfsd/cache.c | 10 +++++-----
nfsd/loop.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/nfsd/cache.c b/nfsd/cache.c
index b97ea394..d4988b53 100644
--- a/nfsd/cache.c
+++ b/nfsd/cache.c
@@ -1,5 +1,5 @@
/*
- Copyright (C) 1996, 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996,98,99,2000,02 Free Software Foundation, Inc.
Written by Michael I. Bushnell, p/BSG.
This file is part of the GNU Hurd.
@@ -212,11 +212,11 @@ scan_creds ()
for (n = 0; n < IDHASH_TABLE_SIZE && nfreeids; n++)
{
struct idspec *i = idhashtable[n];
-
+
while (i && nfreeids)
{
struct idspec *next_i = i->next;
-
+
if (!i->references
&& mapped_time->seconds - i->lastuse > ID_KEEP_TIMEOUT)
{
@@ -256,7 +256,7 @@ fh_hash (char *fhandle, struct idspec *i)
for (n = 0; n < NFS2_FHSIZE; n++)
hash += fhandle[n];
- hash += (int) i >> 6;
+ hash += (intptr_t) i >> 6;
return hash % FHHASH_TABLE_SIZE;
}
@@ -540,7 +540,7 @@ scan_replies ()
while (cr && nfreereplies)
{
struct cached_reply *next_cr = cr->next;
-
+
if (!cr->references
&& mapped_time->seconds - cr->lastuse > REPLY_KEEP_TIMEOUT)
{
diff --git a/nfsd/loop.c b/nfsd/loop.c
index 6af6381c..8f21b105 100644
--- a/nfsd/loop.c
+++ b/nfsd/loop.c
@@ -1,5 +1,5 @@
/* Main server loop for nfs server.
- Copyright (C) 1996, 98 Free Software Foundation, Inc.
+ Copyright (C) 1996,98,2002 Free Software Foundation, Inc.
Written by Michael I. Bushnell, p/BSG.
This file is part of the GNU Hurd.
@@ -52,7 +52,7 @@ server_loop (int fd)
struct idspec *cred;
struct cache_handle *c, fakec;
error_t err;
- size_t addrlen;
+ socklen_t addrlen;
int cc;
bzero (&fakec, sizeof (struct cache_handle));
--
cgit v1.2.3