ptclient: enable pthreaded support

[openafs.git] / src / ptserver / ptclient.c

diff --git a/src/ptserver/ptclient.c b/src/ptserver/ptclient.c
index 9457032..c7347a8 100644 (file)
--- a/src/ptserver/ptclient.c
+++ b/src/ptserver/ptclient.c
@@ -34,11 +34,9 @@ char confdir[AFSDIR_PATH_MAX];
 
 char *whoami;
 
-#ifndef AFS_PTHREAD_ENV
 extern struct ubik_client *pruclient;
 static void skip(char **);
 static void PrintHelp(void);
-#endif
 
 static int ignoreExist = 0;
 static char line[256];
@@ -46,9 +44,8 @@ static char *lineProgress;
 
 #define WHITESPACE " \t\n"
 
-#ifndef AFS_PTHREAD_ENV
 int
-osi_audit()
+osi_audit(void)
 {
 /* OK, this REALLY sucks bigtime, but I can't tell who is calling
  * afsconf_CheckAuth easily, and only *SERVERS* should be calling osi_audit
@@ -56,7 +53,6 @@ osi_audit()
  */
     return 0;
 }
-#endif /* !AFS_PTHREAD_ENV */
 
 int
 GetToken(char *format, afs_int32 *l)
@@ -147,7 +143,6 @@ PrintEntry(afs_int32 ea, struct prentry *e, int indent)
     return pr_PrintEntry(stdout, /*host order */ 1, ea, e, indent);
 }
 
-#ifndef AFS_PTHREAD_ENV
 
 /* main program */
 
@@ -243,7 +238,7 @@ main(int argc, char **argv)
        if (code) {
            afs_com_err(whoami, PRBADARG,
                    "error reading opcode in line '%s', got '%.*s'", line,
-                   sizeof(op), op);
+                   (int) sizeof(op), op);
            exit(1);
        }
        if (strlen(op) == 0)
@@ -359,7 +354,7 @@ main(int argc, char **argv)
            foo = line;
            skip(&foo);
            for (i = 0; ((lnames.namelist_len < PR_MAXLIST)
-                        && (sscanf(foo, "%s", lnames.namelist_val[i]) !=
+                        && (sscanf(foo, "%63s", lnames.namelist_val[i]) !=
                             EOF)); i++) {
                lnames.namelist_len++;
                skip(&foo);
@@ -698,6 +693,7 @@ main(int argc, char **argv)
        else
            printf("Unknown op: '%s'! ? for help\n", op);
     }
+    return 0;
 }
 
 
@@ -739,4 +735,3 @@ skip(char **s)
     while (**s == ' ')
        (*s)++;
 }
-#endif /* !AFS_PTHREAD_ENV */