Remove support for Solaris pre-8

[openafs.git] / src / platform / SOLARIS / fs_conv_sol26.c

diff --git a/src/platform/SOLARIS/fs_conv_sol26.c b/src/platform/SOLARIS/fs_conv_sol26.c
index 90baf4e..3bf52e8 100644 (file)
--- a/src/platform/SOLARIS/fs_conv_sol26.c
+++ b/src/platform/SOLARIS/fs_conv_sol26.c
@@ -10,12 +10,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
 
 #include <stdio.h>
 
-#if defined(AFS_SUN54_ENV)
 #define OSVERS "SunOS 5.6"
 #include <sys/types.h>
 #include <rx/xdr.h>
@@ -43,8 +40,9 @@ RCSID
 #include <afs/osi_inode.h>
 #include <errno.h>
 
-#include <nfs.h>
-#include <partition.h>
+#include <afs/nfs.h>
+#include <afs/ihandle.h>
+#include <afs/partition.h>
 #include <afs/cmd.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -55,27 +53,24 @@ char *rawname(), *unrawname(), *vol_DevName(), *blockcheck();
 #define ROOTINODE      2
 int force = 0, verbose = 0, unconv = 0;
 
-static
-ConvCmd(as)
-     struct cmd_syndesc *as;
+static int
+ConvCmd(struct cmd_syndesc *as, void *arock)
 {
     unconv = 0;
     handleit(as);
 }
 
-static
-UnConvCmd(as)
-     struct cmd_syndesc *as;
+static int
+UnConvCmd(struct cmd_syndesc *as, void *arock)
 {
     unconv = 1;
     handleit(as);
 }
 
-static
-handleit(as)
-     struct cmd_syndesc *as;
+static int
+handleit(struct cmd_syndesc *as)
 {
-    register struct cmd_item *ti;
+    struct cmd_item *ti;
     char *dname;
     afs_int32 haspart = 0, hasDevice = 0;
     struct vfstab mnt;
@@ -190,21 +185,21 @@ handleit(as)
 main(argc, argv)
      char **argv;
 {
-    register struct cmd_syndesc *ts;
+    struct cmd_syndesc *ts;
     afs_int32 code;
 
     if (geteuid() != 0) {
        printf("must be run as root; sorry\n");
        exit(1);
     }
-    ts = cmd_CreateSyntax("convert", ConvCmd, 0,
+    ts = cmd_CreateSyntax("convert", ConvCmd, NULL,
                          "Convert to AFS SunOS 5.6 format");
     cmd_AddParm(ts, "-part", CMD_LIST, CMD_OPTIONAL, "AFS partition name");
     cmd_AddParm(ts, "-verbose", CMD_FLAG, CMD_OPTIONAL, "verbose mode");
     cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL,
                "Safeguard enforce switch");
     cmd_AddParm(ts, "-device", CMD_LIST, CMD_OPTIONAL, "AFS raw device name");
-    ts = cmd_CreateSyntax("unconvert", UnConvCmd, 0,
+    ts = cmd_CreateSyntax("unconvert", UnConvCmd, NULL,
                          "Convert back from AFS SunOS 5.6 to earlier formats");
     cmd_AddParm(ts, "-part", CMD_LIST, CMD_OPTIONAL, "AFS partition name");
     cmd_AddParm(ts, "-verbose", CMD_FLAG, CMD_OPTIONAL, "verbose mode");
@@ -336,11 +331,7 @@ ProcessAfsInodes(devname, partition)
                int p5;
                quad *q;
 
-#if    defined(AFS_SUN56_ENV)
                q = (quad *) & (p->di_ic.ic_lsize);
-#else
-               q = &(p->di_ic.ic_size);
-#endif
 
                p1 = p->di_gen;
                p2 = p->di_ic.ic_flags;
@@ -710,17 +701,3 @@ CheckMountedDevice(devName)
        return 1;
     return 0;
 }
-
-#else /* !AFS_SUN54_ENV */
-
-#include "AFS_component_version_number.c"
-
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
-    printf
-       ("%s: **ONLY** supported for Solaris 2.4 and later ...\n",
-        argv[0]);
-}
-#endif /* !AFS_SUN5_ENV */