aix-cleanup-20061013

fixes for aix pre 5.2 (statfs64), remove a c++ style comment (makes xlc sad) and
 make clean target clean
This commit is contained in:
Tom Keiser 2006-10-13 14:06:38 +00:00 committed by Derrick Brashear
parent 0e8238e7cb
commit 453abf6aa1
3 changed files with 9 additions and 8 deletions

View File

@ -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 \

View File

@ -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. */

View File

@ -535,11 +535,11 @@ DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP)
afs_sfsize_t size;
#ifdef AFS_AIX_ENV
#include <sys/statfs.h>
#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 */