STABLE14-aix-cleanup-20061013

fixes for aix pre 5.2 (statfs64), remove a c++ style comment (makes xlc sad) and make clean target clean

(cherry picked from commit 453abf6aa149e27622745b818afb88019e22171a)

diff --git a/Makefile.in b/Makefile.in
index 577a156298f276ee3fdf4f6dc8ef06ec1fa43c0f..0ee9740e243cfbdcfd7549bbdc1f7f0bcd78349d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -772,6 +772,8 @@ distclean: clean
        src/pam/Makefile \
        src/pinstall/test/Makefile \
        src/pinstall/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 1af357b2a0a50a651f30ddd7861634fd85f9c7e9..4911936291a4b0472579f597e5eaa23a80a090a4 100644 (file)
--- 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 d049c1a95b65b6fc147ea3e2f2782625be370980..c08accabf2f8af73bc883116daab24250b0997b8 100644 (file)
--- a/src/volser/dumpstuff.c
+++ b/src/volser/dumpstuff.c
@@ -530,11 +530,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
 
@@ -550,16 +550,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 */