cmd: Make the original test suite build

[openafs.git] / src / cmd / test / itest.c

diff --git a/src/cmd/test/itest.c b/src/cmd/test/itest.c
index 83282d1..bb0eaf6 100644 (file)
--- a/src/cmd/test/itest.c
+++ b/src/cmd/test/itest.c
@@ -7,25 +7,30 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include "cmd.h"
-#include <stdio.h>
-#include <com_err.h>
+#include <afsconfig.h>
+#include <afs/param.h>
 
-static cproc1 (as, arock)
-char *arock;
-struct cmd_syndesc *as; {
+#include <roken.h>
+
+#include <afs/com_err.h>
+#include <afs/cmd.h>
+
+static int
+cproc1(struct cmd_syndesc *as, void *arock)
+{
     printf("in the apple command\n");
     return 0;
 }
 
-static cproc2 (as, arock)
-char *arock;
-struct cmd_syndesc *as; {
-    register struct cmd_item *ti;
+static int
+cproc2(struct cmd_syndesc *as, void *arock)
+{
+    struct cmd_item *ti;
     printf("in the pear command\n");
     printf("number is %s\n", as->parms[0].items->data);
-    if (as->parms[1].items) printf("running unauthenticated\n");
-    for(ti=as->parms[2].items; ti; ti=ti->next) {
+    if (as->parms[1].items)
+       printf("running unauthenticated\n");
+    for (ti = as->parms[2].items; ti; ti = ti->next) {
        printf("spotspos %s\n", ti->data);
     }
     if (as->parms[8].items)
@@ -33,49 +38,50 @@ struct cmd_syndesc *as; {
     return 0;
 }
 
-static void cproc3(as, arock)
-char *arock;
-struct cmd_syndesc *as; {
+static int
+cproc3(struct cmd_syndesc *as, void *arock)
+{
     exit(0);
 }
 
-main(argc, argv)
-int argc;
-char **argv; {
-    register struct cmd_syndesc *ts;
+int
+main(int argc, char **argv)
+{
+    struct cmd_syndesc *ts;
     char tline[1000];
-    long tc;
+    afs_int32 tc;
     char *tp;
     long code;
     char *tv[100];
-    
-    initialize_cmd_error_table();
 
-    ts = cmd_CreateSyntax("apple", cproc1, (char *) 0, "describe apple");
+    initialize_CMD_error_table();
+
+    ts = cmd_CreateSyntax("apple", cproc1, NULL, "describe apple");
 
-    ts = cmd_CreateSyntax("pear", cproc2, (char *) 0, "describe pear");
+    ts = cmd_CreateSyntax("pear", cproc2, NULL, "describe pear");
     cmd_AddParm(ts, "-num", CMD_LIST, 0, "number of pears");
     cmd_AddParm(ts, "-noauth", CMD_FLAG, CMD_OPTIONAL, "don't authenticate");
     cmd_AddParm(ts, "-spotpos", CMD_LIST, CMD_OPTIONAL | CMD_EXPANDS, 0);
     cmd_Seek(ts, 8);
     cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name");
     cmd_CreateAlias(ts, "alias");
-    
+
     ts = cmd_CreateSyntax("quit", cproc3, 0, "quit");
-    
+
     while (1) {
        printf("> ");
        tp = gets(tline);
-       if (tp == (char *) 0) break;
+       if (tp == NULL)
+           break;
        code = cmd_ParseLine(tline, tv, &tc, 100);
        if (code) {
-           printf("itest: parsing failure: %s\n", error_message(code));
+           printf("itest: parsing failure: %s\n", afs_error_message(code));
            exit(1);
        }
        code = cmd_Dispatch(tc, tv);
        cmd_FreeArgv(tv);
        if (code) {
-           printf("itest: execution failed: %s\n", error_message(code));
+           printf("itest: execution failed: %s\n", afs_error_message(code));
        }
     }
     return 0;