Remove DUX/OSF code

[openafs.git] / src / vfsck / pass4.c

diff --git a/src/vfsck/pass4.c b/src/vfsck/pass4.c
index 37f57ce..3d73dac 100644 (file)
--- a/src/vfsck/pass4.c
+++ b/src/vfsck/pass4.c
@@ -18,29 +18,14 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
+#include <roken.h>
+
+#include <ctype.h>
 
 #define VICE
-#include <sys/param.h>
-#include <sys/time.h>
-#ifdef AFS_OSF_ENV
-#include <sys/vnode.h>
-#include <sys/mount.h>
-#include <ufs/inode.h>
-#include <ufs/fs.h>
-#define        _BSD
-#define        _KERNEL
-#include <ufs/dir.h>
-#undef _KERNEL
-#undef _BSD
-#include <stdio.h>
-#else /* AFS_OSF_ENV */
 #ifdef AFS_VFSINCL_ENV
 #include <sys/vnode.h>
 #ifdef   AFS_SUN5_ENV
-#include <stdio.h>
-#include <unistd.h>
 #include <sys/fs/ufs_inode.h>
 #include <sys/fs/ufs_fs.h>
 #define _KERNEL
@@ -54,14 +39,12 @@ RCSID
 #else /* AFS_VFSINCL_ENV */
 #include <sys/inode.h>
 #ifdef AFS_HPUX_ENV
-#include <ctype.h>
 #define        LONGFILENAMES   1
 #include <sys/sysmacros.h>
 #include <sys/ino.h>
 #endif
 #include <sys/fs.h>
 #endif /* AFS_VFSINCL_ENV */
-#endif /* AFS_OSF_ENV */
 #include <afs/osi_inode.h>
 
 #include "fsck.h"
@@ -70,16 +53,16 @@ int pass4check();
 
 pass4()
 {
-    register ino_t inumber;
-    register struct zlncnt *zlnp;
+    ino_t inumber;
+    struct zlncnt *zlnp;
     struct inodesc idesc;
     int n;
 #if defined(ACLS) && defined(AFS_HPUX_ENV)
-    register struct dinode *dp;
+    struct dinode *dp;
 #endif /* ACLS */
 
 
-    memset((char *)&idesc, 0, sizeof(struct inodesc));
+    memset(&idesc, 0, sizeof(struct inodesc));
     idesc.id_type = ADDR;
     idesc.id_func = pass4check;
     for (inumber = ROOTINO; inumber <= lastino; inumber++) {
@@ -101,7 +84,7 @@ pass4()
                        zlnp->zlncnt = zlnhead->zlncnt;
                        zlnp = zlnhead;
                        zlnhead = zlnhead->next;
-                       free((char *)zlnp);
+                       free(zlnp);
                        clri(&idesc, "UNREF", 1);
                        break;
                    }
@@ -127,15 +110,15 @@ pass4()
            break;
 
 #if defined(ACLS) && defined(AFS_HPUX_ENV)
-           /* 
-            * UNreferenced continuation inode 
+           /*
+            * UNreferenced continuation inode
             */
        case CSTATE:
            clri(&idesc, "UNREF", 2);
            break;
 
-           /* 
-            * referenced continuation inode 
+           /*
+            * referenced continuation inode
             */
        case CRSTATE:
            if ((dp = ginode(inumber)) == NULL)
@@ -146,11 +129,7 @@ pass4()
                    pwarn("I=%u (%ld should be %ld)", inumber, dp->di_nlink,
                          1);
                    if (preen)
-#ifdef VICE
-                       vprintf(" (CORRECTED)\n");
-#else
                        printf(" (CORRECTED)\n");
-#endif /* VICE */
                    else {
                        if (reply("CORRECT") == 0)
                            continue;
@@ -169,9 +148,9 @@ pass4()
 }
 
 pass4check(idesc)
-     register struct inodesc *idesc;
+     struct inodesc *idesc;
 {
-    register struct dups *dlp;
+    struct dups *dlp;
     int nfrags, res = KEEPON;
     daddr_t blkno = idesc->id_blkno;
 
@@ -185,7 +164,7 @@ pass4check(idesc)
                dlp->dup = duplist->dup;
                dlp = duplist;
                duplist = duplist->next;
-               free((char *)dlp);
+               free(dlp);
                break;
            }
            if (dlp == 0) {