uss: Tidy up header includes
[openafs.git] / src / uss / uss_fs.c
index f09d622..77cdb2b 100644 (file)
@@ -1,10 +1,13 @@
-/* Copyright (C) 1990 Transarc Corporation - All rights reserved */
 /*
- * (C) COPYRIGHT IBM CORPORATION 1987, 1988
- * Copyright TRANSARC CORPORATION 1989
- * LICENSED MATERIALS - PROPERTY OF IBM
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
  *
- * uss_fs.c
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+/*
  *     Implementation of the AFS system operations exported by the
  *     Cache Manager.
  */
 /*
  * --------------------- Required definitions ---------------------
  */
+#include <afsconfig.h>
 #include <afs/param.h>
-#include "uss_fs.h"            /*Interface to this module*/
-#include <sys/types.h>
-#include <sys/errno.h>
-#include <sys/socket.h>
-#include <sys/errno.h>
+
+#include <roken.h>
+
 #ifdef AFS_SUN5_ENV
 #include <sys/ioccom.h>
 #endif
-#include <netinet/in.h>
+
 #include <afs/venus.h>
-#include "uss_common.h"
-extern int errno;
+#include <rx/rx.h>
+#include <afs/sys_prototypes.h>
 
+#include "uss_common.h"
+#include "uss_fs.h"            /*Interface to this module */
 
 /*
  * ---------------------- Private definitions ---------------------
@@ -36,8 +40,8 @@ extern int errno;
 /*
  * ------------------------ Private globals -----------------------
  */
-static struct ViceIoctl blob;            /*Param-passing area*/
-static struct ViceIoctl *blobP = &blob;          /*Ptr to above*/
+static struct ViceIoctl blob;  /*Param-passing area */
+static struct ViceIoctl *blobP = &blob;        /*Ptr to above */
 
 
 /*------------------------------------------------------------------------
@@ -60,27 +64,24 @@ static struct ViceIoctl *blobP = &blob;       /*Ptr to above*/
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-static int InAFS(a_path)
-    register char *a_path;
-
-{ /*InAFS*/
+static int
+InAFS(char *a_path)
+{                              /*InAFS */
+    afs_int32 code;
 
-    static char rn[] = "uss_fs:InAFS";
-    register afs_int32 code;
-
-    blob.in       = (char *)0;
-    blob.in_size  = 0;
+    blob.in = NULL;
+    blob.in_size = 0;
     blob.out_size = USS_FS_MAX_SIZE;
-    blob.out      = uss_fs_OutBuff;
+    blob.out = uss_fs_OutBuff;
 
     code = pioctl(a_path, VIOC_FILE_CELL_NAME, blobP, 1);
     if (code) {
        if ((errno == EINVAL) || (errno == ENOENT))
-           return(0);
+           return (0);
     }
-    return(1);
+    return (1);
 
-} /*InAFS*/
+}                              /*InAFS */
 
 
 /*------------------------------------------------------------------------
@@ -94,7 +95,7 @@ static int InAFS(a_path)
  *     char *a_path         : Pathname to ancestorize.
  *     char *a_parentBuff   : Ptr to parent buffer to use.
  *     char **a_componentPP : Ptr to the final component.
- *     
+ *
  *
  * Returns:
  *     Ptr to the buffer containing the parent dir name.
@@ -106,14 +107,9 @@ static int InAFS(a_path)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-static char *ParentAndComponent(a_path, a_parentBuff, a_componentPP)
-    char *a_path;
-    char *a_parentBuff;
-    char **a_componentPP;
-
-{ /*ParentAndComponent*/
-
-    static char rn[] = "uss_fs:Parent";
+static char *
+ParentAndComponent(char *a_path, char *a_parentBuff, char **a_componentPP)
+{                              /*ParentAndComponent */
     char *rightSlashP;
 
     /*
@@ -124,19 +120,18 @@ static char *ParentAndComponent(a_path, a_parentBuff, a_componentPP)
      * we cheat and return ``.''.
      */
     strcpy(a_parentBuff, a_path);
-    rightSlashP = (char *) rindex(a_parentBuff, '/');
+    rightSlashP = (char *)strrchr(a_parentBuff, '/');
     if (rightSlashP) {
        *rightSlashP = 0;
-       *a_componentPP = rightSlashP+1;
-    }
-    else {
+       *a_componentPP = rightSlashP + 1;
+    } else {
        strcpy(a_parentBuff, ".");
        *a_componentPP = a_path;
     }
 
-    return(a_parentBuff);
+    return (a_parentBuff);
 
-} /*ParentAndComponent*/
+}                              /*ParentAndComponent */
 
 
 /*------------------------------------------------------------------------
@@ -164,16 +159,13 @@ static char *ParentAndComponent(a_path, a_parentBuff, a_componentPP)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-static int CarefulPioctl(a_path, a_opcode, a_blobP, a_sl)
-    char *a_path;
-    int a_opcode;
-    struct ViceIoctl *a_blobP;
-    int a_sl;
-
-{ /*CarefulPioctl*/
-
+static int
+CarefulPioctl(char *a_path, int a_opcode, struct ViceIoctl *a_blobP, int a_sl)
+{                              /*CarefulPioctl */
+#ifdef USS_FS_DB
     static char rn[] = "uss_fs:CarefulPioctl";
-    register afs_int32 code;
+#endif
+    afs_int32 code;
 
     /*
      * Call the pioctl() the first time, return if things worked
@@ -185,11 +177,10 @@ static int CarefulPioctl(a_path, a_opcode, a_blobP, a_sl)
     code = pioctl(a_path, a_opcode, a_blobP, a_sl);
 #ifdef USS_FS_DB
     if (code)
-       printf("%s: First pioctl call fails, errno is %d\n",
-              rn, errno);
+       printf("%s: First pioctl call fails, errno is %d\n", rn, errno);
 #endif /* USS_FS_DB */
     if ((code == 0) || (code && (errno != ENODEV)))
-       return(code);
+       return (code);
 
     /*
      * Hmm, it's possible out volume mappings are stale.  Let's
@@ -200,9 +191,9 @@ static int CarefulPioctl(a_path, a_opcode, a_blobP, a_sl)
 #endif /* USS_FS_DB */
     code = uss_fs_CkBackups();
     code = pioctl(a_path, a_opcode, a_blobP, a_sl);
-    return(code);
+    return (code);
 
-} /*CarefulPioctl*/
+}                              /*CarefulPioctl */
 
 
 /*------------------------------------------------------------------------
@@ -215,24 +206,22 @@ static int CarefulPioctl(a_path, a_opcode, a_blobP, a_sl)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 uss_fs_GetACL(a_dirPath, a_aclBuff, a_aclBuffBytes)
-    char *a_dirPath;
-    char *a_aclBuff;
-    afs_int32 a_aclBuffBytes;
-
-{ /*uss_fs_GetACL*/
-
-    static char rn[] = "uss_fs_GetACL";        /*Routine name*/
-    register afs_int32 code;                   /*pioctl() result*/
+afs_int32
+uss_fs_GetACL(char *a_dirPath, char *a_aclBuff, afs_int32 a_aclBuffBytes)
+{                              /*uss_fs_GetACL */
+#ifdef USS_FS_DB
+    static char rn[] = "uss_fs_GetACL";        /*Routine name */
+#endif
+    afs_int32 code;    /*pioctl() result */
 
-    blob.in      = (char *)0;
-    blob.in_size  = 0;
-    blob.out      = a_aclBuff;
+    blob.in = NULL;
+    blob.in_size = 0;
+    blob.out = a_aclBuff;
     blob.out_size = a_aclBuffBytes;
 
 #ifdef USS_FS_DB
-    printf("%s: in 0x%x (%d bytes), out 0x%x, (%d bytes)\n",
-          rn, blob.in, blob.in_size, blob.out, blob.out_size);
+    printf("%s: in 0x%x (%d bytes), out 0x%x, (%d bytes)\n", rn, blob.in,
+          blob.in_size, blob.out, blob.out_size);
 #endif /* USS_FS_DB */
 
     code = CarefulPioctl(a_dirPath, VIOCGETAL, blobP, 1);
@@ -242,9 +231,9 @@ afs_int32 uss_fs_GetACL(a_dirPath, a_aclBuff, a_aclBuffBytes)
        printf("%s: pioctl() failed, errno %d\n", rn, errno);
 #endif /* USS_FS_DB */
 
-    return(code);
+    return (code);
 
-} /*uss_fs_GetACL*/
+}                              /*uss_fs_GetACL */
 
 
 /*------------------------------------------------------------------------
@@ -257,26 +246,23 @@ afs_int32 uss_fs_GetACL(a_dirPath, a_aclBuff, a_aclBuffBytes)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 uss_fs_SetACL(a_dirPath, a_aclBuff, a_aclBuffBytes)
-    char *a_dirPath;
-    char *a_aclBuff;
-    afs_int32 a_aclBuffBytes;
-
-{ /*uss_fs_SetACL*/
-
-    static char rn[] = "uss_fs_SetACL";        /*Routine name*/
-    register afs_int32 code;                   /*pioctl() result*/
+afs_int32
+uss_fs_SetACL(char *a_dirPath, char *a_aclBuff, afs_int32 a_aclBuffBytes)
+{                              /*uss_fs_SetACL */
+#ifdef USS_FS_DB
+    static char rn[] = "uss_fs_SetACL";        /*Routine name */
+#endif
+    afs_int32 code;    /*pioctl() result */
 
-    blob.in      = a_aclBuff;
-    blob.in_size  = a_aclBuffBytes;
-    blob.out      = (char *)0;
+    blob.in = a_aclBuff;
+    blob.in_size = a_aclBuffBytes;
+    blob.out = NULL;
     blob.out_size = 0;
 
 #ifdef USS_FS_DB
-    printf("%s: in 0x%x (%d bytes), out 0x%x, (%d bytes)\n",
-          rn, blob.in, blob.in_size, blob.out, blob.out_size);
-    printf("%s: ACL value for dir '%s' is '%s'\n",
-          rn, a_dirPath, a_aclBuff);
+    printf("%s: in 0x%x (%d bytes), out 0x%x, (%d bytes)\n", rn, blob.in,
+          blob.in_size, blob.out, blob.out_size);
+    printf("%s: ACL value for dir '%s' is '%s'\n", rn, a_dirPath, a_aclBuff);
 #endif /* USS_FS_DB */
 
     code = CarefulPioctl(a_dirPath, VIOCSETAL, blobP, 1);
@@ -286,9 +272,9 @@ afs_int32 uss_fs_SetACL(a_dirPath, a_aclBuff, a_aclBuffBytes)
        printf("%s: pioctl() failed, errno %d", rn, errno);
 #endif /* USS_FS_DB */
 
-    return(code);
+    return (code);
 
-} /*uss_fs_SetACL*/
+}                              /*uss_fs_SetACL */
 
 
 /*------------------------------------------------------------------------
@@ -301,24 +287,23 @@ afs_int32 uss_fs_SetACL(a_dirPath, a_aclBuff, a_aclBuffBytes)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 uss_fs_GetVolStat(a_mountpoint, a_volStatBuff, a_volStatBuffBytes)
-    char *a_mountpoint;
-    char *a_volStatBuff;
-    afs_int32 a_volStatBuffBytes;
-
-{ /*uss_fs_GetVolStat*/
-
-    static char rn[] = "uss_fs_GetVolStat";    /*Routine name*/
-    register afs_int32 code;                           /*pioctl() result*/
+afs_int32
+uss_fs_GetVolStat(char *a_mountpoint, char *a_volStatBuff,
+                 afs_int32 a_volStatBuffBytes)
+{                              /*uss_fs_GetVolStat */
+#ifdef USS_FS_DB
+    static char rn[] = "uss_fs_GetVolStat";    /*Routine name */
+#endif
+    afs_int32 code;    /*pioctl() result */
 
-    blob.in      = (char *)0;
-    blob.in_size  = 0;
-    blob.out      = a_volStatBuff;
+    blob.in = NULL;
+    blob.in_size = 0;
+    blob.out = a_volStatBuff;
     blob.out_size = a_volStatBuffBytes;
 
 #ifdef USS_FS_DB
-    printf("%s: in 0x%x (%d bytes), out 0x%x, (%d bytes)\n",
-          rn, blob.in, blob.in_size, blob.out, blob.out_size);
+    printf("%s: in 0x%x (%d bytes), out 0x%x, (%d bytes)\n", rn, blob.in,
+          blob.in_size, blob.out, blob.out_size);
 #endif /* USS_FS_DB */
 
     code = CarefulPioctl(a_mountpoint, VIOCGETVOLSTAT, blobP, 1);
@@ -328,9 +313,9 @@ afs_int32 uss_fs_GetVolStat(a_mountpoint, a_volStatBuff, a_volStatBuffBytes)
        printf("%s: pioctl() failed, errno %d", rn, errno);
 #endif /* USS_FS_DB */
 
-    return(code);
+    return (code);
 
-} /*uss_fs_GetVolStat*/
+}                              /*uss_fs_GetVolStat */
 
 
 /*------------------------------------------------------------------------
@@ -343,24 +328,23 @@ afs_int32 uss_fs_GetVolStat(a_mountpoint, a_volStatBuff, a_volStatBuffBytes)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 uss_fs_SetVolStat(a_mountpoint, a_volStatBuff, a_volStatBuffBytes)
-    char *a_mountpoint;
-    char *a_volStatBuff;
-    afs_int32 a_volStatBuffBytes;
-
-{ /*uss_fs_SetVolStat*/
-
-    static char rn[] = "uss_fs_SetVolStat";    /*Routine name*/
-    register afs_int32 code;                           /*pioctl() result*/
+afs_int32
+uss_fs_SetVolStat(char *a_mountpoint, char *a_volStatBuff,
+                 afs_int32 a_volStatBuffBytes)
+{                              /*uss_fs_SetVolStat */
+#ifdef USS_FS_DB
+    static char rn[] = "uss_fs_SetVolStat";    /*Routine name */
+#endif
+    afs_int32 code;    /*pioctl() result */
 
-    blob.in      = a_volStatBuff;
-    blob.in_size  = a_volStatBuffBytes;
-    blob.out      = a_volStatBuff;
+    blob.in = a_volStatBuff;
+    blob.in_size = a_volStatBuffBytes;
+    blob.out = a_volStatBuff;
     blob.out_size = USS_FS_MAX_SIZE;
 
 #ifdef USS_FS_DB
-    printf("%s: in 0x%x (%d bytes), out 0x%x, (%d bytes)\n",
-          rn, blob.in, blob.in_size, blob.out, blob.out_size);
+    printf("%s: in 0x%x (%d bytes), out 0x%x, (%d bytes)\n", rn, blob.in,
+          blob.in_size, blob.out, blob.out_size);
 #endif /* USS_FS_DB */
 
     code = CarefulPioctl(a_mountpoint, VIOCSETVOLSTAT, blobP, 1);
@@ -370,9 +354,9 @@ afs_int32 uss_fs_SetVolStat(a_mountpoint, a_volStatBuff, a_volStatBuffBytes)
        printf("%s: pioctl() failed, errno %d", rn, errno);
 #endif /* USS_FS_DB */
 
-    return(code);
+    return (code);
 
-} /*uss_fs_SetVolStat*/
+}                              /*uss_fs_SetVolStat */
 
 
 /*------------------------------------------------------------------------
@@ -385,35 +369,36 @@ afs_int32 uss_fs_SetVolStat(a_mountpoint, a_volStatBuff, a_volStatBuffBytes)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 uss_fs_CkBackups()
-
-{ /*uss_fs_CkBackups*/
-
-    static char rn[] = "uss_fs_CkBackups";     /*Routine name*/
-    register afs_int32 code;                           /*pioctl() result*/
+afs_int32
+uss_fs_CkBackups(void)
+{                              /*uss_fs_CkBackups */
+#ifdef USS_FS_DB
+    static char rn[] = "uss_fs_CkBackups";     /*Routine name */
+#endif
+    afs_int32 code;    /*pioctl() result */
 
-    blob.in       = (char *)0;
-    blob.in_size  = 0;
-    blob.out      = (char *)0;
+    blob.in = NULL;
+    blob.in_size = 0;
+    blob.out = NULL;
     blob.out_size = 0;
-    
+
 #ifdef USS_FS_DB
-    printf("%s: in 0x%x (%d bytes), out 0x%x, (%d bytes)\n",
-          rn, blob.in, blob.in_size, blob.out, blob.out_size);
+    printf("%s: in 0x%x (%d bytes), out 0x%x, (%d bytes)\n", rn, blob.in,
+          blob.in_size, blob.out, blob.out_size);
 #endif /* USS_FS_DB */
 
-    code = pioctl((char *)0,   /*No pathname needed here*/
-                 VIOCCKBACK,   /*CheckBackups*/
-                 &blob,                /*Params*/
-                 1);           /*Symlink disposition*/
+    code = pioctl(NULL,                /*No pathname needed here */
+                 VIOCCKBACK,   /*CheckBackups */
+                 &blob,        /*Params */
+                 1);           /*Symlink disposition */
 #ifdef USS_FS_DB
     if (code)
        printf("%s: pioctl() failed, errno %d", rn, errno);
 #endif /* USS_FS_DB */
 
-    return(code);
+    return (code);
 
-} /*uss_fs_CkBackups*/
+}                              /*uss_fs_CkBackups */
 
 
 /*------------------------------------------------------------------------
@@ -426,21 +411,19 @@ afs_int32 uss_fs_CkBackups()
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 uss_fs_MkMountPoint(a_volname, a_cellname, a_rw, a_mountpoint)
-    char *a_volname;
-    char *a_cellname;
-    afs_int32 a_rw;
-    char *a_mountpoint;
-
-{ /*uss_fs_MkMountPoint*/
+afs_int32
+uss_fs_MkMountPoint(char *a_volname, char *a_cellname, afs_int32 a_rw,
+                   char *a_mountpoint)
+{                              /*uss_fs_MkMountPoint */
     extern int local_Cell;
-    static char rn[] = "uss_fs_MkMountPoint";  /*Routine name*/
-    register afs_int32 code;                           /*pioctl() result*/
-    char *tp;                                  /*Temporary*/
+    static char rn[] = "uss_fs_MkMountPoint";  /*Routine name */
+    afs_int32 code;    /*pioctl() result */
+    char *tp;                  /*Temporary */
 
 #ifdef USS_FS_DB
-    printf("%s: a_volname='%s', a_cellname='%s', a_rw=%d, a_mountpoint='%s'\n",
-          rn, a_volname, a_cellname, a_rw, a_mountpoint);
+    printf
+       ("%s: a_volname='%s', a_cellname='%s', a_rw=%d, a_mountpoint='%s'\n",
+        rn, a_volname, a_cellname, a_rw, a_mountpoint);
 #endif /* USS_FS_DB */
 
     /*
@@ -448,7 +431,7 @@ afs_int32 uss_fs_MkMountPoint(a_volname, a_cellname, a_rw, a_mountpoint)
      */
     if (!InAFS(ParentAndComponent(a_mountpoint, uss_fs_OutBuff, &tp))) {
        printf("%s: Mountpoints must be created within AFS\n", rn);
-       return(-1);
+       return (-1);
     }
 
     /*
@@ -457,13 +440,9 @@ afs_int32 uss_fs_MkMountPoint(a_volname, a_cellname, a_rw, a_mountpoint)
      * char, by convention, is a dot.
      */
     if (local_Cell) {
-       sprintf(uss_fs_OutBuff, "%s%s.",
-               (a_rw ? "%" : "#"),
-               a_volname);
+       sprintf(uss_fs_OutBuff, "%s%s.", (a_rw ? "%" : "#"), a_volname);
     } else {
-       sprintf(uss_fs_OutBuff, "%s%s:%s.",
-               (a_rw ? "%" : "#"),
-               a_cellname,
+       sprintf(uss_fs_OutBuff, "%s%s:%s.", (a_rw ? "%" : "#"), a_cellname,
                a_volname);
     }
 
@@ -473,13 +452,13 @@ afs_int32 uss_fs_MkMountPoint(a_volname, a_cellname, a_rw, a_mountpoint)
     code = symlink(uss_fs_OutBuff, a_mountpoint);
     if (code) {
 #ifdef USS_FS_DB
-       printf("%s: Mountpoint creation (symlink) failed, errno is %d\n",
-              rn, errno);
+       printf("%s: Mountpoint creation (symlink) failed, errno is %d\n", rn,
+              errno);
 #endif /* USS_FS_DB */
-       return(-1);
+       return (-1);
     }
-
-} /*uss_fs_MkMountPoint*/
+    return 0;
+}                              /*uss_fs_MkMountPoint */
 
 
 /*------------------------------------------------------------------------
@@ -492,26 +471,22 @@ afs_int32 uss_fs_MkMountPoint(a_volname, a_cellname, a_rw, a_mountpoint)
  *     As advertised.
  *------------------------------------------------------------------------*/
 
-afs_int32 uss_fs_RmMountPoint(a_mountpoint)
-    char *a_mountpoint;
-
-{ /*uss_fs_RmMountPoint*/
-
-    static char rn[] = "uss_fs_RmMountPoint";  /*Routine name*/
-    register afs_int32 code;                           /*pioctl() result*/
-    char *parentDirP;                          /*Ptr to parent*/
-    char *componentP;                          /*Ptr to last component*/
+afs_int32
+uss_fs_RmMountPoint(char *a_mountpoint)
+{                              /*uss_fs_RmMountPoint */
+    static char rn[] = "uss_fs_RmMountPoint";  /*Routine name */
+    afs_int32 code;    /*pioctl() result */
+    char *parentDirP;          /*Ptr to parent */
+    char *componentP;          /*Ptr to last component */
 
     /*
      * Get the parent & final component names.
      */
-    parentDirP = ParentAndComponent(a_mountpoint,
-                                   uss_fs_InBuff,
-                                   &componentP);
+    parentDirP = ParentAndComponent(a_mountpoint, uss_fs_InBuff, &componentP);
 
-    blob.in      = componentP;
-    blob.in_size  = strlen(componentP) + 1;
-    blob.out      = uss_fs_OutBuff;
+    blob.in = componentP;
+    blob.in_size = strlen(componentP) + 1;
+    blob.out = uss_fs_OutBuff;
     blob.out_size = USS_FS_MAX_SIZE;
 
 #ifdef USS_FS_DB
@@ -525,23 +500,23 @@ afs_int32 uss_fs_RmMountPoint(a_mountpoint)
        printf("%s: STAT_MT_PT pioctl() failed, errno %d", rn, errno);
 #endif /* USS_FS_DB */
        if (errno == EINVAL)
-           printf("%s: '%s' is not a mountpoint\n",
-                  rn, a_mountpoint);
-       return(code);
+           printf("%s: '%s' is not a mountpoint\n", rn, a_mountpoint);
+       return (code);
     }
 
     /*
      * Now that we know we have a proper mountpoint, nuke it.
      */
-    blob.in      = componentP;
-    blob.in_size  = strlen(componentP) + 1;
-    blob.out      = (char *)0;
+    blob.in = componentP;
+    blob.in_size = strlen(componentP) + 1;
+    blob.out = NULL;
     blob.out_size = 0;
 
     if (!uss_DryRun) {
 #ifdef USS_FS_DB
-       printf("%s: AFS_DELETE_MT_PT, in 0x%x (%d bytes), out 0x%x, (%d bytes)\n",
-              rn, blob.in, blob.in_size, blob.out, blob.out_size);
+       printf
+           ("%s: AFS_DELETE_MT_PT, in 0x%x (%d bytes), out 0x%x, (%d bytes)\n",
+            rn, blob.in, blob.in_size, blob.out, blob.out_size);
 #endif /* USS_FS_DB */
 
        code = pioctl(parentDirP, VIOC_AFS_DELETE_MT_PT, blobP, 1);
@@ -549,48 +524,50 @@ afs_int32 uss_fs_RmMountPoint(a_mountpoint)
 #ifdef USS_FS_DB
            printf("%s: DELETE_MT_PT pioctl() failed, errno %d", rn, errno);
 #endif /* USS_FS_DB */
-       } 
+       }
     } else
        printf("\t[Dry run - mount point '%s' NOT removed]\n", componentP);
 
-    return(code);
+    return (code);
 
-} /*uss_fs_RmMountPoint*/
+}                              /*uss_fs_RmMountPoint */
 
 
 #include <afs/auth.h>
 struct tokenInfo {
-    struct ktc_token  token;
+    struct ktc_token token;
     struct ktc_principal service;
     struct ktc_principal client;
     int deleted;
 };
 
 /*
- * Build a list of tokens, delete the bad ones (the ones to remove from the 
+ * Build a list of tokens, delete the bad ones (the ones to remove from the
  * permissions list,) destroy all tokens, and then re-register the good ones.
  * Ugly, but it works.
  */
-uss_fs_UnlogToken(celln)
-    char *celln;
+int
+uss_fs_UnlogToken(char *celln)
 {
-    unsigned count = 0, index, index2;
-    afs_int32 code = 0, cnt=0;
+    int count = 0, index, index2;
+    afs_int32 code = 0, cnt = 0;
     struct ktc_principal serviceName;
     struct tokenInfo *tokenInfoP, *tp;
 
     do {
        code = ktc_ListTokens(count, &count, &serviceName);
        cnt++;
-    } while(!code);
+    } while (!code);
     count = cnt - 1;
-    tokenInfoP = (struct tokenInfo *)malloc((sizeof(struct tokenInfo)*count));
-    for (code = index = index2= 0; (!code) && (index < count); index++) {
-       tp = tokenInfoP+index;
+    tokenInfoP =
+       (struct tokenInfo *)malloc((sizeof(struct tokenInfo) * count));
+    for (code = index = index2 = 0; (!code) && (index < count); index++) {
+       tp = tokenInfoP + index;
        code = ktc_ListTokens(index2, &index2, &tp->service);
        if (!code) {
-           code = ktc_GetToken(&tp->service, &tp->token, sizeof(struct ktc_token),
-                               &tp->client);
+           code =
+               ktc_GetToken(&tp->service, &tp->token,
+                            sizeof(struct ktc_token), &tp->client);
            if (!code) {
                tp->deleted = (!strcmp(celln, tp->client.cell) ? 1 : 0);
                if (tp->deleted)
@@ -598,21 +575,21 @@ uss_fs_UnlogToken(celln)
            }
        }
     }
-    if (code = ktc_ForgetAllTokens ()) {
-       printf("uss_fs_UnlogToken: could not discard tickets, code %d\n", code);
+    if ((code = ktc_ForgetAllTokens())) {
+       printf("uss_fs_UnlogToken: could not discard tickets, code %d\n",
+              code);
        exit(1);
     }
-    for (code = index = 0; index < count ; index++) {
-       tp = tokenInfoP+index;
+    for (code = index = 0; index < count; index++) {
+       tp = tokenInfoP + index;
        if (!(tp->deleted)) {
            code = ktc_SetToken(&tp->service, &tp->token, &tp->client, 0);
            if (code) {
-               printf("uss_fs_UnlogToken: Couldn't re-register token, code = %d\n",
-                       code);
+               printf
+                   ("uss_fs_UnlogToken: Couldn't re-register token, code = %d\n",
+                    code);
            }
        }
     }
     return 0;
 }
-
-