From 0d1159c724a03ff10a4b31641e8b07d5722dc360 Mon Sep 17 00:00:00 2001 From: Jim Rees Date: Wed, 19 May 2004 21:31:18 +0000 Subject: [PATCH] banish-ushort-20040519 Change ushort to afs_uint16. ushort is a SysV thing, not present in FreeBSD. --- src/afs/afs.h | 4 ++-- src/afs/afs_prototypes.h | 2 +- src/afs/afs_server.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/afs/afs.h b/src/afs/afs.h index 355a29345..49f2c408d 100644 --- a/src/afs/afs.h +++ b/src/afs/afs.h @@ -633,8 +633,8 @@ struct vcache { afs_uint32 Date; afs_uint32 Owner; afs_uint32 Group; - ushort Mode; /* XXXX Should be afs_int32 XXXX */ - ushort LinkCount; + afs_uint16 Mode; /* XXXX Should be afs_int32 XXXX */ + afs_uint16 LinkCount; /* vnode type is in v.v_type */ } m; afs_rwlock_t lock; /* The lock on the vcache contents. */ diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h index 43aa28236..c4875b6e1 100644 --- a/src/afs/afs_prototypes.h +++ b/src/afs/afs_prototypes.h @@ -685,7 +685,7 @@ extern struct srvAddr *afs_srvAddrs[NSERVERS]; extern struct server *afs_servers[NSERVERS]; extern int afs_totalServers; extern struct server *afs_setTimeHost; -extern struct server *afs_FindServer(afs_int32 aserver, ushort aport, +extern struct server *afs_FindServer(afs_int32 aserver, afs_uint16 aport, afsUUID * uuidp, afs_int32 locktype); extern struct server *afs_GetServer(afs_uint32 * aserver, afs_int32 nservers, afs_int32 acell, u_short aport, diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c index 6643c1ee2..99d64d385 100644 --- a/src/afs/afs_server.c +++ b/src/afs/afs_server.c @@ -714,7 +714,7 @@ afs_CheckServers(int adown, struct cell *acellp) /* find a server structure given the host address */ struct server * -afs_FindServer(afs_int32 aserver, ushort aport, afsUUID * uuidp, +afs_FindServer(afs_int32 aserver, afs_uint16 aport, afsUUID * uuidp, afs_int32 locktype) { struct server *ts; -- 2.39.5