From 8f00fdfd5fc09f6c341125d46fa7457108dfa796 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 8 Aug 2003 22:54:30 +0000 Subject: [PATCH] reindent-again-20030808 FIXES 1774 catch things which crept in. if emacs hadn't started ignoring my code formatting settings this would suck so much less.... --- src/JAVA/libjafs/Internal.c | 11 +++++++---- src/afs/VNOPS/afs_vnop_lookup.c | 28 ++++++++++++++-------------- src/afs/afs_call.c | 8 +++----- src/afs/afs_volume.c | 3 ++- src/afsd/afsd.c | 9 +++++---- src/bozo/bosserver.c | 4 ++-- src/butc/dump.c | 3 ++- src/butc/tcmain.c | 1 - src/butm/file_tm.c | 8 ++++---- src/config/param.alpha_dux40.h | 2 +- src/config/param.alpha_dux50.h | 2 +- src/config/param.alpha_dux51.h | 2 +- src/config/param.hp_ux102.h | 2 +- src/config/param.hp_ux110.h | 2 +- src/config/param.hp_ux11i.h | 2 +- src/config/param.rs_aix42.h | 2 +- src/config/param.rs_aix51.h | 2 +- src/config/param.sgi_62.h | 2 +- src/config/param.sgi_63.h | 2 +- src/config/param.sgi_64.h | 2 +- src/config/param.sgi_65.h | 2 +- src/config/param.sun4x_55.h | 2 +- src/config/param.sun4x_56.h | 2 +- src/inetd/inetd.c | 5 ++--- src/kauth/prot.h | 8 ++++---- src/kauth/user_nt.c | 6 ++++-- src/libadmin/test/bos.c | 18 ++++++++++++------ src/libadmin/test/client.c | 9 ++++++--- src/libadmin/test/kas.c | 6 ++++-- src/libadmin/test/vos.c | 30 ++++++++++++++++++++---------- src/lwp/lwp.c | 5 +++-- src/pinstall/install.c | 6 +++--- src/ptserver/ptclient.c | 7 +++---- src/ptserver/utils.c | 4 ++-- src/rx/rx_stream.c | 4 ++-- src/util/afs_atomlist.c | 10 ++++++---- src/venus/fstrace.c | 4 ++-- src/viced/callback.c | 8 ++++---- src/viced/host.c | 9 ++++----- src/viced/viced.c | 10 +++++----- src/vol/fs_conv_411.c | 6 +++--- 41 files changed, 142 insertions(+), 116 deletions(-) diff --git a/src/JAVA/libjafs/Internal.c b/src/JAVA/libjafs/Internal.c index ce0206044..9ca036568 100644 --- a/src/JAVA/libjafs/Internal.c +++ b/src/JAVA/libjafs/Internal.c @@ -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; diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c index e9d760a04..5fff99e53 100644 --- a/src/afs/VNOPS/afs_vnop_lookup.c +++ b/src/afs/VNOPS/afs_vnop_lookup.c @@ -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) diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c index 188a33390..e66121863 100644 --- a/src/afs/afs_call.c +++ b/src/afs/afs_call.c @@ -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(); diff --git a/src/afs/afs_volume.c b/src/afs/afs_volume.c index d78e84958..5a5ca0402 100644 --- a/src/afs/afs_volume.c +++ b/src/afs/afs_volume.c @@ -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) { diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c index 0f31dc9e3..96bc6c29e 100644 --- a/src/afsd/afsd.c +++ b/src/afsd/afsd.c @@ -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)); } diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c index b78484957..070c4eeb2 100644 --- a/src/bozo/bosserver.c +++ b/src/bozo/bosserver.c @@ -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); diff --git a/src/butc/dump.c b/src/butc/dump.c index 603d0bebb..595df24b0 100644 --- a/src/butc/dump.c +++ b/src/butc/dump.c @@ -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", diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c index a6ef3445e..d5a26a004 100644 --- a/src/butc/tcmain.c +++ b/src/butc/tcmain.c @@ -642,7 +642,6 @@ GetConfigParams(filename, port) #endif } } - #ifndef xbsa /* All the xbsa spacific parameters */ else if (!strcmp(cmd, "TYPE") || !strcmp(cmd, "NODE") diff --git a/src/butm/file_tm.c b/src/butm/file_tm.c index ac4d47f29..d918a69d8 100644 --- a/src/butm/file_tm.c +++ b/src/butm/file_tm.c @@ -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 diff --git a/src/config/param.alpha_dux40.h b/src/config/param.alpha_dux40.h index 39ce77c0e..bfe4ccdd5 100644 --- a/src/config/param.alpha_dux40.h +++ b/src/config/param.alpha_dux40.h @@ -144,7 +144,7 @@ enum vcexcl { NONEXCL, EXCL }; #include - /*#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 diff --git a/src/config/param.alpha_dux50.h b/src/config/param.alpha_dux50.h index d00f87c90..d48b64103 100644 --- a/src/config/param.alpha_dux50.h +++ b/src/config/param.alpha_dux50.h @@ -151,7 +151,7 @@ enum vcexcl { NONEXCL, EXCL }; #include - /*#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 diff --git a/src/config/param.alpha_dux51.h b/src/config/param.alpha_dux51.h index 99a51135e..de3a26dec 100644 --- a/src/config/param.alpha_dux51.h +++ b/src/config/param.alpha_dux51.h @@ -152,7 +152,7 @@ enum vcexcl { NONEXCL, EXCL }; #include - /*#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 diff --git a/src/config/param.hp_ux102.h b/src/config/param.hp_ux102.h index 1194955cc..e140a0664 100644 --- a/src/config/param.hp_ux102.h +++ b/src/config/param.hp_ux102.h @@ -120,7 +120,7 @@ struct uio; #include - /*#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' */ diff --git a/src/config/param.hp_ux110.h b/src/config/param.hp_ux110.h index 7ac27410e..4c0d6b012 100644 --- a/src/config/param.hp_ux110.h +++ b/src/config/param.hp_ux110.h @@ -128,7 +128,7 @@ struct uio; #include - /*#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' */ diff --git a/src/config/param.hp_ux11i.h b/src/config/param.hp_ux11i.h index a5790460a..e5bd9377f 100644 --- a/src/config/param.hp_ux11i.h +++ b/src/config/param.hp_ux11i.h @@ -129,7 +129,7 @@ struct uio; #include - /*#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' */ diff --git a/src/config/param.rs_aix42.h b/src/config/param.rs_aix42.h index a6850a3eb..911bd65f9 100644 --- a/src/config/param.rs_aix42.h +++ b/src/config/param.rs_aix42.h @@ -126,7 +126,7 @@ #include - /*#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 diff --git a/src/config/param.rs_aix51.h b/src/config/param.rs_aix51.h index 5cdf7d161..ecfe978c4 100644 --- a/src/config/param.rs_aix51.h +++ b/src/config/param.rs_aix51.h @@ -137,7 +137,7 @@ #include - /*#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 diff --git a/src/config/param.sgi_62.h b/src/config/param.sgi_62.h index f35ab75d2..3909d7b9a 100644 --- a/src/config/param.sgi_62.h +++ b/src/config/param.sgi_62.h @@ -140,7 +140,7 @@ #include - /*#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' */ diff --git a/src/config/param.sgi_63.h b/src/config/param.sgi_63.h index d26e98f2d..f3bec5f30 100644 --- a/src/config/param.sgi_63.h +++ b/src/config/param.sgi_63.h @@ -133,7 +133,7 @@ #include - /*#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' */ diff --git a/src/config/param.sgi_64.h b/src/config/param.sgi_64.h index c65bccb80..f04f613c0 100644 --- a/src/config/param.sgi_64.h +++ b/src/config/param.sgi_64.h @@ -149,7 +149,7 @@ #include - /*#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' */ diff --git a/src/config/param.sgi_65.h b/src/config/param.sgi_65.h index dbdb3cd24..239d4167c 100644 --- a/src/config/param.sgi_65.h +++ b/src/config/param.sgi_65.h @@ -159,7 +159,7 @@ #include - /*#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' */ diff --git a/src/config/param.sun4x_55.h b/src/config/param.sun4x_55.h index 76a01ee7d..40a79164e 100644 --- a/src/config/param.sun4x_55.h +++ b/src/config/param.sun4x_55.h @@ -123,7 +123,7 @@ #include - /*#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 diff --git a/src/config/param.sun4x_56.h b/src/config/param.sun4x_56.h index ef942e972..859756c5f 100644 --- a/src/config/param.sun4x_56.h +++ b/src/config/param.sun4x_56.h @@ -123,7 +123,7 @@ #include - /*#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 diff --git a/src/inetd/inetd.c b/src/inetd/inetd.c index 67480fe32..fbe5f7a90 100644 --- a/src/inetd/inetd.c +++ b/src/inetd/inetd.c @@ -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); diff --git a/src/kauth/prot.h b/src/kauth/prot.h index c618b82a6..3e0c58b4e 100644 --- a/src/kauth/prot.h +++ b/src/kauth/prot.h @@ -11,7 +11,7 @@ #include - /* #include *//* removed 890221 */ + /* #include *//* 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 */ diff --git a/src/kauth/user_nt.c b/src/kauth/user_nt.c index 5f3aed6ec..9d2c24939 100644 --- a/src/kauth/user_nt.c +++ b/src/kauth/user_nt.c @@ -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]; diff --git a/src/libadmin/test/bos.c b/src/libadmin/test/bos.c index 9f235dbdc..47bb63b95 100644 --- a/src/libadmin/test/bos.c +++ b/src/libadmin/test/bos.c @@ -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; diff --git a/src/libadmin/test/client.c b/src/libadmin/test/client.c index 28683ab40..289632dc8 100644 --- a/src/libadmin/test/client.c +++ b/src/libadmin/test/client.c @@ -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; diff --git a/src/libadmin/test/kas.c b/src/libadmin/test/kas.c index 2d7df0358..c5bcd37f6 100644 --- a/src/libadmin/test/kas.c +++ b/src/libadmin/test/kas.c @@ -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; diff --git a/src/libadmin/test/vos.c b/src/libadmin/test/vos.c index 673d06811..2882fad23 100644 --- a/src/libadmin/test/vos.c +++ b/src/libadmin/test/vos.c @@ -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; diff --git a/src/lwp/lwp.c b/src/lwp/lwp.c index 8a0d5048d..69828d34d 100644 --- a/src/lwp/lwp.c +++ b/src/lwp/lwp.c @@ -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) diff --git a/src/pinstall/install.c b/src/pinstall/install.c index ae5102460..6cb0f1223 100644 --- a/src/pinstall/install.c +++ b/src/pinstall/install.c @@ -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[] = { diff --git a/src/ptserver/ptclient.c b/src/ptserver/ptclient.c index 061a88f51..2a21b3864 100644 --- a/src/ptserver/ptclient.c +++ b/src/ptserver/ptclient.c @@ -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); } diff --git a/src/ptserver/utils.c b/src/ptserver/utils.c index 886d39cac..4999c1175 100644 --- a/src/ptserver/utils.c +++ b/src/ptserver/utils.c @@ -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 diff --git a/src/rx/rx_stream.c b/src/rx/rx_stream.c index 84d86d334..1cdba1c29 100644 --- a/src/rx/rx_stream.c +++ b/src/rx/rx_stream.c @@ -17,8 +17,8 @@ This file is now obsolete. #include #endif -RCSID - ("$Header$"); + RCSID + ("$Header$"); #ifdef KERNEL #include "h/types.h" diff --git a/src/util/afs_atomlist.c b/src/util/afs_atomlist.c index 27f8bf227..2ed863ba7 100644 --- a/src/util/afs_atomlist.c +++ b/src/util/afs_atomlist.c @@ -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; diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c index 68ba0b946..cf0c58500 100644 --- a/src/venus/fstrace.c +++ b/src/venus/fstrace.c @@ -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 ----*/ { diff --git a/src/viced/callback.c b/src/viced/callback.c index 37f325e63..f4d8c5a1c 100644 --- a/src/viced/callback.c +++ b/src/viced/callback.c @@ -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++) { diff --git a/src/viced/host.c b/src/viced/host.c index 289d9694d..9da6af451 100644 --- a/src/viced/host.c +++ b/src/viced/host.c @@ -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++) { diff --git a/src/viced/viced.c b/src/viced/viced.c index e4dabe06f..b7b22cf7e 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -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")); diff --git a/src/vol/fs_conv_411.c b/src/vol/fs_conv_411.c index 6a2cdb292..056203844 100644 --- a/src/vol/fs_conv_411.c +++ b/src/vol/fs_conv_411.c @@ -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++; -- 2.39.5