solaris-fs-conv-needs-ihandle-20090604

[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..790f33a 100644 (file)
--- a/src/platform/SOLARIS/fs_conv_sol26.c
+++ b/src/platform/SOLARIS/fs_conv_sol26.c
@@ -44,6 +44,7 @@ RCSID
 #include <errno.h>
 
 #include <nfs.h>
+#include <afs/ihandle.h>
 #include <partition.h>
 #include <afs/cmd.h>
 #include <stdlib.h>
@@ -55,25 +56,22 @@ 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;
     char *dname;
@@ -197,14 +195,14 @@ main(argc, argv)
        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");