reindent-again-20030808
authorDerrick Brashear <shadow@dementia.org>
Fri, 8 Aug 2003 22:54:30 +0000 (22:54 +0000)
committerDerrick Brashear <shadow@dementia.org>
Fri, 8 Aug 2003 22:54:30 +0000 (22:54 +0000)
FIXES 1774

catch things which crept in. if emacs hadn't started ignoring my code
formatting settings this would suck so much less....

41 files changed:
src/JAVA/libjafs/Internal.c
src/afs/VNOPS/afs_vnop_lookup.c
src/afs/afs_call.c
src/afs/afs_volume.c
src/afsd/afsd.c
src/bozo/bosserver.c
src/butc/dump.c
src/butc/tcmain.c
src/butm/file_tm.c
src/config/param.alpha_dux40.h
src/config/param.alpha_dux50.h
src/config/param.alpha_dux51.h
src/config/param.hp_ux102.h
src/config/param.hp_ux110.h
src/config/param.hp_ux11i.h
src/config/param.rs_aix42.h
src/config/param.rs_aix51.h
src/config/param.sgi_62.h
src/config/param.sgi_63.h
src/config/param.sgi_64.h
src/config/param.sgi_65.h
src/config/param.sun4x_55.h
src/config/param.sun4x_56.h
src/inetd/inetd.c
src/kauth/prot.h
src/kauth/user_nt.c
src/libadmin/test/bos.c
src/libadmin/test/client.c
src/libadmin/test/kas.c
src/libadmin/test/vos.c
src/lwp/lwp.c
src/pinstall/install.c
src/ptserver/ptclient.c
src/ptserver/utils.c
src/rx/rx_stream.c
src/util/afs_atomlist.c
src/venus/fstrace.c
src/viced/callback.c
src/viced/host.c
src/viced/viced.c
src/vol/fs_conv_411.c

index ce02060..9ca0365 100644 (file)
@@ -165,8 +165,10 @@ jfieldID process_stateBadFileAccessField = 0;
  * for the exception.  See Exceptions.h for the available
  * exceptions.
  */
-void throwException(JNIEnv * env, jclass * excCls, char *excClsName,
-                   jmethodID * initID, int code) {
+void
+throwException(JNIEnv * env, jclass * excCls, char *excClsName,
+              jmethodID * initID, int code)
+{
     jobject exc;
     if (*excCls == 0) {
        *excCls =
@@ -469,8 +471,9 @@ getNativeString(JNIEnv * env, const jstring jstr)
  *
  * @returns            file descriptor
  */
-int openAFSFile(JNIEnv * env, jstring filenameUTF, int flags, int mode,
-               int *err) {
+int
+openAFSFile(JNIEnv * env, jstring filenameUTF, int flags, int mode, int *err)
+{
     char *filename;
     int fd = -1;
 
index e9d760a..5fff99e 100644 (file)
@@ -64,11 +64,11 @@ EvalMountPoint(register struct vcache *avc, struct vcache *advc,
     struct volume *tvp = 0;
     struct VenusFid tfid;
     struct cell *tcell;
-    char   *cpos, *volnamep;
-    char   type, *buf;
-    afs_int32  prefetch;          /* 1=>None  2=>RO  3=>BK */
-    afs_int32  mtptCell, assocCell, hac = 0;
-    afs_int32  samecell, roname, len;
+    char *cpos, *volnamep;
+    char type, *buf;
+    afs_int32 prefetch;                /* 1=>None  2=>RO  3=>BK */
+    afs_int32 mtptCell, assocCell, hac = 0;
+    afs_int32 samecell, roname, len;
 
     AFS_STATCNT(EvalMountPoint);
 #ifdef notdef
@@ -121,14 +121,14 @@ EvalMountPoint(register struct vcache *avc, struct vcache *advc,
      *   want to prefetch the RO volume.
      */
     if ((type == '#') && !roname) {
-       if (afs_bkvolpref && samecell && (avc->states & CBackup))
-           prefetch = 3; /* Prefetch the BK */
-       else if (!samecell || (avc->states & CRO))
-           prefetch = 2; /* Prefetch the RO */
-       else
-           prefetch = 1; /* Do not prefetch */
+       if (afs_bkvolpref && samecell && (avc->states & CBackup))
+           prefetch = 3;       /* Prefetch the BK */
+       else if (!samecell || (avc->states & CRO))
+           prefetch = 2;       /* Prefetch the RO */
+       else
+           prefetch = 1;       /* Do not prefetch */
     } else {
-       prefetch = 1; /* Do not prefetch */
+       prefetch = 1;           /* Do not prefetch */
     }
 
     /* Get the volume struct. Unless this volume name has ".readonly" or
@@ -139,7 +139,7 @@ EvalMountPoint(register struct vcache *avc, struct vcache *advc,
 
     /* If no volume was found in this cell, try the associated linked cell */
     if (!tvp && hac && areq->volumeError) {
-       tvp =
+       tvp =
            afs_GetVolumeByName(volnamep, assocCell, prefetch, areq,
                                WRITE_LOCK);
     }
@@ -191,7 +191,7 @@ EvalMountPoint(register struct vcache *avc, struct vcache *advc,
        afs_PutVolume(tvp, WRITE_LOCK); /* release old volume */
        tvp = afs_GetVolume(&tfid, areq, WRITE_LOCK);   /* get the new one */
        if (!tvp)
-          return ENODEV;       /* oops, can't do it */
+           return ENODEV;      /* oops, can't do it */
     }
 
     if (avc->mvid == 0)
index 188a333..e661218 100644 (file)
@@ -871,12 +871,10 @@ afs_syscall_call(parm, parm2, parm3, parm4, parm5, parm6)
     } else if (parm == AFSOP_SET_FAKESTAT) {
        afs_fakestat_enable = parm2;
        code = 0;
-    }
-    else if (parm == AFSOP_SET_BACKUPTREE) {
+    } else if (parm == AFSOP_SET_BACKUPTREE) {
        afs_bkvolpref = parm2;
-    }
-    else
-      code = EINVAL;
+    } else
+       code = EINVAL;
 
   out:
     AFS_GUNLOCK();
index d78e849..5a5ca04 100644 (file)
@@ -693,7 +693,8 @@ afs_NewVolumeByName(char *aname, afs_int32 acell, int agood,
         * This means that very soon we'll ask for the BK volume so
         * we'll prefetch it (well we did already.)
         */
-       tv1 = afs_SetupVolume(tv->backVol, (char *)0, ve, tcell, 0, type, areq);
+       tv1 =
+           afs_SetupVolume(tv->backVol, (char *)0, ve, tcell, 0, type, areq);
        tv1->refCount--;
     }
     if ((agood >= 2) && tv->roVol) {
index 0f31dc9..96bc6c2 100644 (file)
@@ -265,10 +265,10 @@ static int enable_process_stats = 0;      /* enable rx stats */
 #ifdef AFS_AFSDB_ENV
 static int enable_afsdb = 0;   /* enable AFSDB support */
 #endif
-static int enable_dynroot = 0;         /* enable dynroot support */
-static int enable_fakestat = 0;                /* enable fakestat support */
+static int enable_dynroot = 0; /* enable dynroot support */
+static int enable_fakestat = 0;        /* enable fakestat support */
 static int enable_backuptree = 0;      /* enable backup tree support */
-static int enable_nomount = 0;         /* do not mount */
+static int enable_nomount = 0; /* do not mount */
 #ifdef notdef
 static int inodes = 60;                /* VERY conservative, but has to be */
 #endif
@@ -2164,7 +2164,8 @@ main(argc, argv)
     cmd_AddParm(ts, "-fakestat-all", CMD_FLAG, CMD_OPTIONAL,
                "Enable fakestat support for all mounts");
     cmd_AddParm(ts, "-nomount", CMD_FLAG, CMD_OPTIONAL, "Do not mount AFS");
-    cmd_AddParm(ts, "-backuptree", CMD_FLAG, CMD_OPTIONAL, "Prefer backup volumes for mointpoints in backup volumes");
+    cmd_AddParm(ts, "-backuptree", CMD_FLAG, CMD_OPTIONAL,
+               "Prefer backup volumes for mointpoints in backup volumes");
     return (cmd_Dispatch(argc, argv));
 }
 
index b784849..070c4ee 100644 (file)
@@ -966,8 +966,8 @@ main(int argc, char **argv, char **envp)
     rx_SetNoJumbo();
 
     tservice = rx_NewService( /* port */ 0, /* service id */ 1,
-                                                       /*service name */ "bozo",
-                                                       /* security classes */
+                            /*service name */ "bozo",
+                            /* security classes */
                             bozo_rxsc,
                             /* numb sec classes */ 3, BOZO_ExecuteRequest);
     rx_SetMinProcs(tservice, 2);
index 603d0be..595df24 100644 (file)
@@ -473,7 +473,8 @@ dumpVolume(struct tc_dumpDesc * curDump, struct dumpRock * dparamsPtr)
      * If we hit the end, see if this is the first volume on the tape or not.
      * Also, mark the tape as finished if the tape contains other dumps.
      */
-    if (!code) code = rc;
+    if (!code)
+       code = rc;
     if (HITEOT(code)) {
        ErrorLog(2, taskId, code, tapeInfoPtr->error,
                 "Warning: Dump (%s) hit end-of-tape inferred\n",
index a6ef344..d5a26a0 100644 (file)
@@ -642,7 +642,6 @@ GetConfigParams(filename, port)
 #endif
            }
        }
-
 #ifndef xbsa
        /* All the xbsa spacific parameters */
        else if (!strcmp(cmd, "TYPE") || !strcmp(cmd, "NODE")
index ac4d47f..d918a69 100644 (file)
@@ -32,12 +32,12 @@ RCSID
 #include "error_macros.h"
 
 #ifdef O_LARGEFILE
-typedef off64_t         osi_lloff_t;
+typedef off64_t osi_lloff_t;
 #else /* O_LARGEFILE */
 #ifdef AFS_HAVE_LLSEEK
-typedef offset_t        osi_lloff_t;
+typedef offset_t osi_lloff_t;
 #else /* AFS_HAVE_LLSEEK */
-typedef off_t           osi_lloff_t;
+typedef off_t osi_lloff_t;
 #endif /* AFS_HAVE_LLSEEK */
 #endif /* O_LARGEFILE */
 
@@ -1622,7 +1622,7 @@ file_Seek(info, position)
 
     if (isafile) {
        p = (struct progress *)info->tmRock;
-       posit = (osi_lloff_t)position * (osi_lloff_t)BUTM_BLOCKSIZE;
+       posit = (osi_lloff_t) position *(osi_lloff_t) BUTM_BLOCKSIZE;
 
        /* Not really necessary to do it this way, should be fixed */
 #ifdef O_LARGEFILE
index 39ce77c..bfe4ccd 100644 (file)
@@ -144,7 +144,7 @@ enum vcexcl { NONEXCL, EXCL };
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 #define        AFS_SYSCALL             232
index d00f87c..d48b641 100644 (file)
@@ -151,7 +151,7 @@ enum vcexcl { NONEXCL, EXCL };
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 #define        AFS_SYSCALL             232
index 99a5113..de3a26d 100644 (file)
@@ -152,7 +152,7 @@ enum vcexcl { NONEXCL, EXCL };
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 #define        AFS_SYSCALL             232
index 1194955..e140a06 100644 (file)
@@ -120,7 +120,7 @@ struct uio;
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 
index 7ac2741..4c0d6b0 100644 (file)
@@ -128,7 +128,7 @@ struct uio;
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 
index a579046..e5bd937 100644 (file)
@@ -129,7 +129,7 @@ struct uio;
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 
index a6850a3..911bd65 100644 (file)
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 #define        AFS_SYSCALL             105
index 5cdf7d1..ecfe978 100644 (file)
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 #define        AFS_SYSCALL             105
index f35ab75..3909d7b 100644 (file)
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 
index d26e98f..f3bec5f 100644 (file)
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 
index c65bccb..f04f613 100644 (file)
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 
index dbdb3cd..239d416 100644 (file)
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 
index 76a01ee..40a7916 100644 (file)
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 #define        AFS_SYSCALL             105
index ef942e9..859756c 100644 (file)
 
 #include <afs/afs_sysnames.h>
 
-                                                                          /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
+                                                                                                              /*#define AFS_GLOBAL_SUNLOCK    1 *//* For global locking */
 
 #define        AFS_3DISPARES           1       /* Utilize the 3 available disk inode 'spares' */
 #define        AFS_SYSCALL             105
index 67480fe..fbe5f7a 100644 (file)
@@ -1270,9 +1270,8 @@ auth_stream(s, sepent)
                debug = 0;
                dup2(0, 2);
 
-               if (!afs_didsetpag
-                   && (!strcmp(sep->se_service, "login")
-                       || !strcmp(sep->se_service, "shell"))) {
+               if (!afs_didsetpag && (!strcmp(sep->se_service, "login")
+                                      || !strcmp(sep->se_service, "shell"))) {
                    setpag();   /* to disassociate it from current group... */
                }
                execv(sep->se_server, sep->se_argv);
index c618b82..3e0c58b 100644 (file)
@@ -11,7 +11,7 @@
 
 #include <mit-cpyright.h>
 
-                                                      /* #include <krb_conf.h> *//* removed 890221 */
+                                                                                 /* #include <krb_conf.h> *//* removed 890221 */
 
 #ifndef PROT_DEFS
 #define PROT_DEFS
@@ -60,9 +60,9 @@
 
 /* Routines to create and read packets may be found in prot.c */
 
-                                                                /* KTEXT create_auth_reply(); *//* removed 890221 */
-                                                                    /* KTEXT create_death_packet(); *//* removed 890221 */
-                                                  /* KTEXT pkt_cipher(); *//* removed 890221 */
+                                                                                                /* KTEXT create_auth_reply(); *//* removed 890221 */
+                                                                                                      /* KTEXT create_death_packet(); *//* removed 890221 */
+                                                                           /* KTEXT pkt_cipher(); *//* removed 890221 */
 
 /* Message types , always leave lsb for byte order */
 
index 5f3aed6..9d2c249 100644 (file)
@@ -296,8 +296,10 @@ KTEXT pkt_cipher(KTEXT packet);
  * Check the response with the supplied key. If the key is apparently
  * wrong, return INTK_BADPW, otherwise zero.
  */
-static check_response(KTEXT rpkt, KTEXT cip, char *service, char *instance,
-                     char *realm, struct ktc_encryptionKey *key) {
+static
+check_response(KTEXT rpkt, KTEXT cip, char *service, char *instance,
+              char *realm, struct ktc_encryptionKey *key)
+{
     Key_schedule key_s;
     char *ptr;
     char s_service[SNAME_SZ];
index 9f235db..47bb63b 100644 (file)
@@ -271,7 +271,8 @@ int
 DoBosProcessCreate(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PROCESS, BINARY, CRON, CRONTIME,
-           NOTIFIER } DoBosProcessCreate_parm_t;
+       NOTIFIER
+    } DoBosProcessCreate_parm_t;
     afs_status_t st = 0;
     void *bos_server = NULL;
     const char *process = NULL;
@@ -473,7 +474,8 @@ int
 DoBosProcessExecutionStateSet(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PROCESS, STOPPED,
-           RUNNING } DoBosProcessExecutionStateSet_parm_t;
+       RUNNING
+    } DoBosProcessExecutionStateSet_parm_t;
     afs_status_t st = 0;
     void *bos_server = NULL;
     const char *process = NULL;
@@ -523,7 +525,8 @@ int
 DoBosProcessExecutionStateSetTemporary(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PROCESS, STOPPED,
-           RUNNING } DoBosProcessExecutionStateSetTemporary_parm_t;
+       RUNNING
+    } DoBosProcessExecutionStateSetTemporary_parm_t;
     afs_status_t st = 0;
     void *bos_server = NULL;
     const char *process = NULL;
@@ -1386,7 +1389,8 @@ int
 DoBosExecutablePrune(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, OLDFILES, BAKFILES,
-           COREFILES } DoBosExecutablePrune_parm_t;
+       COREFILES
+    } DoBosExecutablePrune_parm_t;
     afs_status_t st = 0;
     void *bos_server = NULL;
     bos_Prune_t old_files = BOS_DONT_PRUNE;
@@ -1426,7 +1430,8 @@ int
 DoBosExecutableRestartTimeSet(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, DAILY, WEEKLY,
-           TIME } DoBosExecutableRestartTimeSet_parm_t;
+       TIME
+    } DoBosExecutableRestartTimeSet_parm_t;
     afs_status_t st = 0;
     void *bos_server = NULL;
     bos_Restart_t type;
@@ -1524,7 +1529,8 @@ int
 DoBosExecutableRestartTimeGet(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, DAILY,
-           WEEKLY } DoBosExecutableRestartTimeGet_parm_t;
+       WEEKLY
+    } DoBosExecutableRestartTimeGet_parm_t;
     afs_status_t st = 0;
     void *bos_server = NULL;
     bos_Restart_t type;
index 28683ab..289632d 100644 (file)
@@ -278,7 +278,8 @@ int
 DoClientMountPointCreate(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { DIRECTORY, VOLUME, READWRITE,
-           CHECK } DoClientMountPointCreate_parm_t;
+       CHECK
+    } DoClientMountPointCreate_parm_t;
     afs_status_t st = 0;
     const char *directory;
     const char *volume;
@@ -476,7 +477,8 @@ int
 DoClientRPCStatsStateGet(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PROCESS,
-           STAT_TYPE } DoClientRPCStatsStateGet_parm_t;
+       STAT_TYPE
+    } DoClientRPCStatsStateGet_parm_t;
     afs_status_t st = 0;
     struct rx_connection *conn;
     int servAddr = 0;
@@ -589,7 +591,8 @@ int
 DoClientRPCStatsStateDisable(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PROCESS,
-           STAT_TYPE } DoClientRPCStatsDisable_parm_t;
+       STAT_TYPE
+    } DoClientRPCStatsDisable_parm_t;
     afs_status_t st = 0;
     struct rx_connection *conn;
     int servAddr = 0;
index 2d7df03..c5bcd37 100644 (file)
@@ -48,7 +48,8 @@ int
 DoKasPrincipalCreate(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { PRINCIPAL, INSTANCE,
-           PASSWORD } DoKasPrincipalCreate_parm_t;
+       PASSWORD
+    } DoKasPrincipalCreate_parm_t;
     afs_status_t st = 0;
     const char *instance = NULL;
     kas_identity_t user;
@@ -220,7 +221,8 @@ int
 DoKasPrincipalKeySet(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { PRINCIPAL, INSTANCE, PASSWORD,
-           KEYVERSION } DoKasPrincipalKeySet_parm_t;
+       KEYVERSION
+    } DoKasPrincipalKeySet_parm_t;
     afs_status_t st = 0;
     kas_encryptionKey_t key;
     kas_identity_t user;
index 673d068..2882fad 100644 (file)
@@ -162,7 +162,8 @@ int
 DoVosBackupVolumeCreateMultiple(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PARTITION, PREFIX,
-           EXCLUDE } DoVosBackupVolumeCreate_parm_t;
+       EXCLUDE
+    } DoVosBackupVolumeCreate_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -308,7 +309,8 @@ int
 DoVosFileServerAddressChange(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { OLDADDRESS,
-           NEWADDRESS } DoVosFileServerAddressChange_parm_t;
+       NEWADDRESS
+    } DoVosFileServerAddressChange_parm_t;
     afs_status_t st = 0;
     int old_addr, new_addr;
 
@@ -707,7 +709,8 @@ int
 DoVosVLDBReadOnlySiteCreate(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PARTITION,
-           VOLUME } DoVosVLDBReadOnlySiteCreate_parm_t;
+       VOLUME
+    } DoVosVLDBReadOnlySiteCreate_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -741,7 +744,8 @@ int
 DoVosVLDBReadOnlySiteDelete(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PARTITION,
-           VOLUME } DoVosVLDBReadOnlySiteDelete_parm_t;
+       VOLUME
+    } DoVosVLDBReadOnlySiteDelete_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -815,7 +819,8 @@ int
 DoVosVolumeCreate(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PARTITION, VOLUME,
-           QUOTA } DoVosVolumeCreate_parm_t;
+       QUOTA
+    } DoVosVolumeCreate_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -917,7 +922,8 @@ int
 DoVosVolumeDump(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PARTITION, VOLUME, STARTTIME,
-           DUMPFILE } DoVosVolumeDump_parm_t;
+       DUMPFILE
+    } DoVosVolumeDump_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -972,7 +978,8 @@ int
 DoVosVolumeRestore(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PARTITION, ID, VOLUME, DUMPFILE,
-           FULL } DoVosVolumeRestore_parm_t;
+       FULL
+    } DoVosVolumeRestore_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -1025,7 +1032,8 @@ int
 DoVosVolumeOnline(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PARTITION, VOLUME, SLEEP,
-           BUSY } DoVosVolumeOnline_parm_t;
+       BUSY
+    } DoVosVolumeOnline_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -1412,7 +1420,8 @@ int
 DoVosVolumeMove(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { VOLUME, FROMSERVER, FROMPARTITION, TOSERVER,
-           TOPARTITION } DoVosVolumeMove_parm_t;
+       TOPARTITION
+    } DoVosVolumeMove_parm_t;
     afs_status_t st = 0;
     void *from_server = NULL;
     void *to_server = NULL;
@@ -1566,7 +1575,8 @@ int
 DoVosVolumeQuotaChange(struct cmd_syndesc *as, char *arock)
 {
     typedef enum { SERVER, PARTITION, VOLUME,
-           QUOTA } DoVosVolumeQuotaChange_parm_t;
+       QUOTA
+    } DoVosVolumeQuotaChange_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
index 8a0d504..69828d3 100644 (file)
@@ -973,8 +973,9 @@ Free_PCB(PROCESS pid)
 {
     Debug(4, ("Entered Free_PCB"));
     if (pid->stack != NULL) {
-       Debug(0, ("HWM stack usage: %d, [PCB at 0x%x]",
-                 Stack_Used(pid->stack, pid->stacksize), pid));
+       Debug(0,
+             ("HWM stack usage: %d, [PCB at 0x%x]",
+              Stack_Used(pid->stack, pid->stacksize), pid));
        free(pid->stack);
     }
     if (pid->eventlist != NULL)
index ae51024..6cb0f12 100644 (file)
@@ -93,7 +93,7 @@ static int stripcalled = 0;
 
 /* How many systems don't have strerror now? */
 #ifndef HAVE_STRERROR
-#if !defined(AFS_DARWIN60_ENV) && !defined(AFS_FBSD50_ENV) 
+#if !defined(AFS_DARWIN60_ENV) && !defined(AFS_FBSD50_ENV)
 extern int sys_nerr;
 #endif
 #if !defined(AFS_LINUX20_ENV) && !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV)
@@ -183,7 +183,7 @@ quickStrip(char *iname, char *oname, int ignored, int copy_only)
 {
     int pid;
     pid_t status;
-    static char *env[] = { 
+    static char *env[] = {
        0,
     };
     static char *strip[] = {
@@ -275,7 +275,7 @@ static int
 quickStrip(char *iname, char *oname, int ignored, int copy_only)
 {
     int pid, status;
-    static char *env[] = { 
+    static char *env[] = {
        0,
     };
     static char *strip[] = {
index 061a88f..2a21b38 100644 (file)
@@ -368,10 +368,9 @@ main(argc, argv)
            lnames.namelist_len = 0;
            foo = line;
            skip(&foo);
-           for (i = 0;
-                ((lnames.namelist_len < PR_MAXLIST)
-                 && (sscanf(foo, "%s", lnames.namelist_val[i]) != EOF));
-                i++) {
+           for (i = 0; ((lnames.namelist_len < PR_MAXLIST)
+                        && (sscanf(foo, "%s", lnames.namelist_val[i]) !=
+                            EOF)); i++) {
                lnames.namelist_len++;
                skip(&foo);
            }
index 886d39c..4999c11 100644 (file)
@@ -35,8 +35,8 @@ RCSID
 
 #if defined(SUPERGROUPS)
 extern afs_int32 depthsg;
-afs_int32 IsAMemberOfSG(struct ubik_trans *at, afs_int32 aid,
-                       afs_int32 gid, afs_int32 depth);
+afs_int32 IsAMemberOfSG(struct ubik_trans *at, afs_int32 aid, afs_int32 gid,
+                       afs_int32 depth);
 #endif
 
 afs_int32
index 84d86d3..1cdba1c 100644 (file)
@@ -17,8 +17,8 @@ This file is now obsolete.
 #include <afs/param.h>
 #endif
  
-RCSID
-  ("$Header$");
+    RCSID
+    ("$Header$");
 
 #ifdef KERNEL
 #include "h/types.h"
index 27f8bf2..2ed863b 100644 (file)
@@ -86,10 +86,12 @@ struct afs_atomlist {
     void *block_head;          /* pointer to block list */
 };
 
-afs_atomlist *afs_atomlist_create(size_t atom_size, size_t block_size,
-                                 void *(*allocate) (size_t n)
-                                 , void (*deallocate) (void *p, size_t n)
-    ) {
+afs_atomlist *
+afs_atomlist_create(size_t atom_size, size_t block_size,
+                   void *(*allocate) (size_t n)
+                   , void (*deallocate) (void *p, size_t n)
+    )
+{
     afs_atomlist *al;
     size_t atoms_per_block;
     size_t extra_space;
index 68ba0b9..cf0c585 100644 (file)
@@ -963,7 +963,7 @@ open1catfile(file)
            while (*np && *np != ':')
                *p++ = *np++;
            *p = '\0';
-           if (*np)                            /*----  iff on a colon then advance --*/
+           if (*np)                                    /*----  iff on a colon then advance --*/
                np++;
            valid = 0;
            if (strlen(cpth)) {
@@ -1081,7 +1081,7 @@ cat_already_open(cat)
 
 
 int
-catclose1(catd)                                /*---- the catd to be closed ----*/
+catclose1(catd)                                        /*---- the catd to be closed ----*/
      nl_catd catd;     /*---- the catd to be closed ----*/
 
 {
index 37f325e..f4d8c5a 100644 (file)
@@ -969,8 +969,8 @@ DeleteCallBack(struct host *host, AFSFid * fid)
        h_Unlock_r(host);
        H_UNLOCK;
        ViceLog(8,
-               ("DCB: No call backs for fid (%u, %u, %u)\n",
-                fid->Volume, fid->Vnode, fid->Unique));
+               ("DCB: No call backs for fid (%u, %u, %u)\n", fid->Volume,
+                fid->Vnode, fid->Unique));
        return 0;
     }
     pcb = FindCBPtr(fe, host);
@@ -1011,8 +1011,8 @@ DeleteFileCallBacks(AFSFid * fid)
     if (!fe) {
        H_UNLOCK;
        ViceLog(8,
-               ("DF: No fid (%u,%u,%u) to delete\n", fid->Volume,
-                fid->Vnode, fid->Unique));
+               ("DF: No fid (%u,%u,%u) to delete\n", fid->Volume, fid->Vnode,
+                fid->Unique));
        return 0;
     }
     for (n = 0, cbi = fe->firstcb; cbi; n++) {
index 289d969..9da6af4 100644 (file)
@@ -1761,12 +1761,11 @@ h_DumpHost(register struct host *host, int held, StreamHandle_t * file)
     (void)afs_snprintf(tmpStr, sizeof tmpStr,
                       "ip:%x port:%d hidx:%d cbid:%d lock:%x last:%u active:%u down:%d del:%d cons:%d cldel:%d\n\t hpfailed:%d hcpsCall:%u hcps [",
                       host->host, ntohs(host->port), host->index,
-                      host->cblist, CheckLock(&host->lock),
-                      host->LastCall, host->ActiveCall,
-                      (host->hostFlags & VENUSDOWN),
+                      host->cblist, CheckLock(&host->lock), host->LastCall,
+                      host->ActiveCall, (host->hostFlags & VENUSDOWN),
                       host->hostFlags & HOSTDELETED, host->Console,
-                      host->hostFlags & CLIENTDELETED,
-                      host->hcpsfailed, host->cpsCall);
+                      host->hostFlags & CLIENTDELETED, host->hcpsfailed,
+                      host->cpsCall);
     (void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
     if (host->hcps.prlist_val)
        for (i = 0; i < host->hcps.prlist_len; i++) {
index e4dabe0..b7b22cf 100644 (file)
@@ -1666,11 +1666,11 @@ main(int argc, char *argv[])
     sc[1] = 0;                 /* rxvab_NewServerSecurityObject(key1, 0) */
     sc[2] = rxkad_NewServerSecurityObject(rxkad_clear, NULL, get_key, NULL);
     sc[3] = rxkad_NewServerSecurityObject(rxkad_crypt, NULL, get_key, NULL);
-    tservice =
-       rx_NewService( /* port */ 0, /* service id */ 1, /*service name */
-                     "AFS",
-                     /* security classes */ sc, /* numb sec classes */ 4,
-                     RXAFS_ExecuteRequest);
+    tservice = rx_NewService( /* port */ 0, /* service id */ 1,        /*service name */
+                            "AFS",
+                                                       /* security classes */ sc,
+                                                       /* numb sec classes */
+                            4, RXAFS_ExecuteRequest);
     if (!tservice) {
        ViceLog(0,
                ("Failed to initialize RX, probably two servers running.\n"));
index 6a2cdb2..0562038 100644 (file)
@@ -875,9 +875,9 @@ ProcessAfsInodes(devname, partition)
                    /* for inodes created in solaris 2.4, there is a possibility
                     ** that the gid gets chopped off to an unsigned short(2 bytes)
                     */
-                   if ((p2 || p3) && !p4
-                       && ((p5 == -2)
-                           || ((unsigned short)p5 == (unsigned short)-2))) {
+                   if ((p2 || p3) && !p4 && ((p5 == -2)
+                                             || ((unsigned short)p5 ==
+                                                 (unsigned short)-2))) {
                        /* This is a pre Sol2.6 inode */
                        mod = 1;
                        cnt++;