From 453abf6aa149e27622745b818afb88019e22171a Mon Sep 17 00:00:00 2001 From: Tom Keiser Date: Fri, 13 Oct 2006 14:06:38 +0000 Subject: [PATCH] aix-cleanup-20061013 fixes for aix pre 5.2 (statfs64), remove a c++ style comment (makes xlc sad) and make clean target clean --- Makefile.in | 2 ++ src/ptserver/ptuser.c | 1 - src/volser/dumpstuff.c | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1aa846a..026dc4d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -744,6 +744,8 @@ distclean: clean src/lwp/test/Makefile \ src/lwp/Makefile \ src/pam/Makefile \ + src/platform/Makefile \ + src/platform/${MKAFS_OSTYPE}/Makefile \ src/procmgmt/Makefile \ src/procmgmt/test/Makefile \ src/ptserver/Makefile \ diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c index 5c525f7..515f685 100644 --- a/src/ptserver/ptuser.c +++ b/src/ptserver/ptuser.c @@ -625,7 +625,6 @@ pr_CheckEntryByName(char *name, afs_int32 *id, char *owner, char *creator) if (*id == ANONYMOUSID) return PRNOENT; code = ubik_PR_ListEntry(pruclient, 0, *id, &aentry); - //code = ubik_PR_ListEntry(pruclient, 0, *id, &aentry); if (code) return code; /* this should be done in one RPC, but I'm lazy. */ diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index 6090ce6..adfc769 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -535,11 +535,11 @@ DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP) afs_sfsize_t size; #ifdef AFS_AIX_ENV #include -#ifdef AFS_LARGEFILE_ENV +#if defined(AFS_AIX52_ENV) && defined(AFS_LARGEFILE_ENV) struct statfs64 tstatfs; -#else /* !AFS_LARGEFILE_ENV */ +#else /* !AFS_AIX52_ENV || !AFS_LARGEFILE_ENV */ struct statfs tstatfs; -#endif /* !AFS_LARGEFILE_ENV */ +#endif /* !AFS_AIX52_ENV || !AFS_LARGEFILE_ENV */ int statfs_code; #endif @@ -555,16 +555,16 @@ DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP) /* Unfortunately in AIX valuable fields such as st_blksize are * gone from the stat structure. */ -#ifdef AFS_LARGEFILE_ENV +#if defined(AFS_AIX52_ENV) && defined(AFS_LARGEFILE_ENV) statfs_code = fstatfs64(handleP->fd_fd, &tstatfs); -#else /* !AFS_LARGEFILE_ENV */ +#else /* !AFS_AIX52_ENV || !AFS_LARGEFILE_ENV */ statfs_code = fstatfs(handleP->fd_fd, &tstatfs); -#endif /* !AFS_LARGEFILE_ENV */ +#endif /* !AFS_AIX52_ENV || !AFS_LARGEFILE_ENV */ if (statfs_code != 0) { Log("DumpFile: fstatfs returned error code %d on descriptor %d\n", errno, handleP->fd_fd); return VOLSERDUMPERROR; } - howMany = tstatfs.f_bsize; + howMany = (afs_sfsize_t) tstatfs.f_bsize; #else howMany = status.st_blksize; #endif /* AFS_AIX_ENV */ -- 1.9.4