From 4e2c9285f412438efaf42227cef5709153a004f2 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Wed, 23 Jun 2004 15:27:35 +0000 Subject: [PATCH] prototyping-20040623 i had this laying around, i don't know from when, but i should flush it to cvs --- src/mpp/mpp.c | 76 +++++++-------------- src/package/check.c | 14 +--- src/package/conftree.c | 62 +++-------------- src/package/globfuncs.c | 15 +--- src/package/messages.c | 17 +---- src/package/misc.c | 8 +-- src/package/package.c | 12 +--- src/package/test.c | 104 ++++------------------------ src/package/update.c | 105 +++++++--------------------- src/ptserver/db_verify.c | 105 +++++++++++----------------- src/ptserver/display.c | 14 +--- src/ptserver/map.c | 75 ++++++-------------- src/ptserver/pt_util.c | 29 +++----- src/ptserver/pts.c | 91 +++++++++++-------------- src/ptserver/ptserver.c | 3 +- src/ptserver/ptuser.c | 159 +++++++++++++++---------------------------- src/ptserver/ptutils.c | 133 ++++++++---------------------------- src/ptserver/readgroup.c | 13 ++-- src/ptserver/readpwd.c | 5 +- src/ptserver/testpt.c | 66 +++++++----------- src/ptserver/utils.c | 145 +++++++++------------------------------ src/rxkad/rxkad_common.c | 24 +++++++ src/rxkad/rxkad_prototypes.h | 2 + src/update/client.c | 44 ++++-------- src/update/server.c | 50 ++++---------- src/update/utils.c | 23 +------ src/vol/vnode.c | 1 + src/vol/vol-info.c | 2 +- 28 files changed, 406 insertions(+), 991 deletions(-) diff --git a/src/mpp/mpp.c b/src/mpp/mpp.c index dec7299..aab27c2 100644 --- a/src/mpp/mpp.c +++ b/src/mpp/mpp.c @@ -45,38 +45,23 @@ static char inline[maxlinesize]; static char outline[maxlinesize]; static struct macro *macrohashtable[macrohashsize]; -static -error(a0, a1) - char *a0, *a1; +static int +error(char *a0, char *a1) { fprintf(stderr, a0, a1); putc('\n', stderr); exit(1); } -static -fileerror(a0, a1) - char *a0, *a1; +static int +fileerror(char *a0, char *a1); { fprintf(stderr, "%s; line %d: ", filep->name, filep->lineno); error(a0, a1); } -static char * -strsav(s) - char *s; -{ - char *p; - - if ((p = malloc(strlen(s) + 1)) == NULL) - error("Out of Memory"); - strcpy(p, s); - return p; -} - static struct macro ** -macrolookup(name) - char *name; +macrolookup(char *name) { register struct macro **mpp, *mp; register char *cp; @@ -89,9 +74,8 @@ macrolookup(name) return mpp; } -static -macroundefine(name) - char *name; +static void +macroundefine(char *name) { register struct macro **mpp, *mp; @@ -104,11 +88,8 @@ macroundefine(name) } } -static -macrodefine(name, value, mode) - char *name; - char *value; - enum macromode mode; +static void +macrodefine(char *name, char *value, enum macromode mode) { register struct macro **mpp, *mp; @@ -120,18 +101,17 @@ macrodefine(name, value, mode) } else { if ((mp = (struct macro *)malloc(sizeof(struct macro))) == 0) error("Out of memory"); - mp->name = strsav(name); + mp->name = strdup(name); mp->next = 0; *mpp = mp; } mp->mode = mode; - mp->value = strsav(value); + mp->value = strdup(value); } static char * -macroexpand(dst, src) - register char *dst, *src; +macroexpand(register char *dst, register char *src) { char name[macronamesize]; register char *np; @@ -174,9 +154,8 @@ macroexpand(dst, src) -static -readline(line) - char *line; +static int +readline(char *line) { while (filep >= &files[0]) { filep->lineno++; @@ -192,17 +171,15 @@ readline(line) return 0; } -static -writeline(line) - char *line; +static void +writeline(char *line) { fputs(line, stdout); } -static -directive(what) - char *what; +static int +directive(char *what) { char *arg[3], *cp; int n; @@ -271,7 +248,7 @@ directive(what) filep--; fileerror("Can't open %s", arg[1]); } - filep->name = strsav(arg[1]); + filep->name = strdup(arg[1]); filep->lineno = 0; return 1; } @@ -286,18 +263,18 @@ directive(what) fileerror("Unknown directive %s", arg[0]); } -expandfile(name) - char *name; +void +expandfile(char *name) { if (strcmp(name, "-") == 0) { filep->stream = stdin; - filep->name = strsav("(stdin)"); + filep->name = strdup("(stdin)"); } else { if ((filep->stream = fopen(name, "r")) == NULL) { fileerror("Can't open %s", name); exit(1); } - filep->name = strsav(name); + filep->name = strdup(name); } filep->lineno = 0; while (readline(inline)) { @@ -316,7 +293,7 @@ expandfile(name) } } -static +static int usage() { fprintf(stderr, "Usage: mpp [-cC][-s][-Dname=value][-Uname][-][files]\n"); @@ -325,9 +302,8 @@ usage() #include "AFS_component_version_number.c" -main(argc, argv) - int argc; - char **argv; +int +main(int argc, char **argv) { argv++, argc--; if (argc == 0) diff --git a/src/package/check.c b/src/package/check.c index 16166ec..97434dc 100644 --- a/src/package/check.c +++ b/src/package/check.c @@ -52,12 +52,9 @@ static char path3[MAXPATHLEN + 1]; /* $$get rid of this */ * May exit from package. *------------------------------------------------------------------------*/ -static -CheckMount(path) - char *path; - +static void +CheckMount(char *path) { /*CheckMount */ - struct stat stb; /*Parent's stat block */ struct stat stb2; /*Child's stat block */ char dir[MAXPATHLEN]; /*Pathname of candidate mount point */ @@ -122,7 +119,6 @@ CheckMount(path) * verbose, tell everyone. */ verbose_message("Found Unix mountpoint %s", dir); - } /*CheckMount */ /*------------------------------------------------------------------------ @@ -149,10 +145,7 @@ CheckMount(path) *------------------------------------------------------------------------*/ int -check(np, path) - register CTREEPTR np; - char *path; - +check(register CTREEPTR np, char *path) { /*check */ register CTREEPTR np2; /*Node ptr for np's child */ @@ -326,5 +319,4 @@ check(np, path) */ (void)closedir(dp); return (retval); - } /*check */ diff --git a/src/package/conftree.c b/src/package/conftree.c index 555404e..1fdfda5 100644 --- a/src/package/conftree.c +++ b/src/package/conftree.c @@ -54,9 +54,7 @@ extern FILE *yyin; /*Input file for the YACC parser */ *------------------------------------------------------------------------*/ static int -namehash(name) - register char *name; - +namehash(register char *name) { /*namehash */ register int hash; @@ -123,10 +121,7 @@ AllocConfigNode() *------------------------------------------------------------------------*/ static int -ValidUpdtSpec(ftype, uspec) - u_short ftype; - u_short uspec; - +ValidUpdtSpec(u_short ftype, u_short uspec) { /*ValidUpdtSpec */ register struct updatetype *u; @@ -169,10 +164,7 @@ ValidUpdtSpec(ftype, uspec) *------------------------------------------------------------------------*/ static int -ValidateUserName(name, uidp) - register char *name; - register short *uidp; - +ValidateUserName(register char *name, register short *uidp) { /*ValidateUserName */ register afs_int32 uid; @@ -242,10 +234,7 @@ ValidateUserName(name, uidp) *------------------------------------------------------------------------*/ static int -ValidateGroupName(name, gidp) - register char *name; - register short *gidp; - +ValidateGroupName(register char *name, register short *gidp) { /*ValidateGroupName */ register afs_int32 gid; @@ -342,11 +331,7 @@ InitializeConfigTree() *------------------------------------------------------------------------*/ CTREEPTR -LocateChildNode(dp, name, lmode) - register CTREEPTR dp; - register char *name; - register int lmode; - +LocateChildNode(register CTREEPTR dp, register char *name, register int lmode) { /*LocateChildNode */ register int hash; /*Hash value for given name */ @@ -442,13 +427,8 @@ LocateChildNode(dp, name, lmode) *------------------------------------------------------------------------*/ CTREEPTR -LocatePathNode(dp, path, lmode) - register CTREEPTR dp; - register char *path; - register int lmode; - +LocatePathNode(register CTREEPTR dp, register char *path, register int lmode) { /*LocatePathNode */ - register char *name; /*Points to start of new subdir/file in path */ register char savech; /*Saves chars being murdered during search */ @@ -497,7 +477,6 @@ LocatePathNode(dp, path, lmode) * just return it. */ return (dp); - } /*LocatePathNode */ /*------------------------------------------------------------------------ @@ -521,17 +500,13 @@ LocatePathNode(dp, path, lmode) *------------------------------------------------------------------------*/ int -BuildConfigTree(f) - FILE *f; - +BuildConfigTree(FILE *f) { /*BuildConfigTree */ - int ret; yyin = f; ret = yyparse(); return (ret); - } /*BuildConfigTree */ /*------------------------------------------------------------------------ @@ -564,16 +539,8 @@ BuildConfigTree(f) *------------------------------------------------------------------------*/ int -AddEntry(filetype, updtspec, filename, prototype, ownershipinfo, mode) - u_short filetype; - u_short updtspec; - char *filename; - PROTOTYPE prototype; - OWNER ownershipinfo; - MODE mode; - +AddEntry(u_short filetype, u_short updtspec, char *filename, PROTOTYPE prototype, OWNER ownershipinfo, MODE mode) { /*AddEntry */ - CTREEPTR np; /*Ptr to config tree node holding info on filename */ short uid, gid; /*Uid, gid returned from validation functions */ @@ -723,9 +690,7 @@ AddEntry(filetype, updtspec, filename, prototype, ownershipinfo, mode) *------------------------------------------------------------------------*/ void -ApplyConfigTree(func) - int (*func) (); - +ApplyConfigTree(int (*func) ()) { /*ApplyConfigTree */ char *path; /*Path to pass on down */ @@ -764,13 +729,9 @@ ApplyConfigTree(func) * Whatever func might do. *------------------------------------------------------------------------*/ -TraverseConfigTree(np, path, func) - register CTREEPTR np; - char *path; - int (*func) (); - +void +TraverseConfigTree(register CTREEPTR np, char *path, int (*func) ()) { /*TraverseConfigTree */ - register char *endp; /*Marks the end of a string */ register ENTRYPTR ep; /*Current entry pointer */ register int len; /*Length of the pathname */ @@ -820,5 +781,4 @@ TraverseConfigTree(np, path, func) * the path properly before returning. */ *--endp = 0; - } /*TraverseConfigTree */ diff --git a/src/package/globfuncs.c b/src/package/globfuncs.c index e624103..b53963f 100644 --- a/src/package/globfuncs.c +++ b/src/package/globfuncs.c @@ -40,9 +40,7 @@ *------------------------------------------------------------------------*/ char * -emalloc(size) - unsigned size; - +emalloc(unsigned int size) { /*emalloc */ char *malloc(); @@ -55,7 +53,6 @@ emalloc(size) exit(ERR_OUTOFMEMORY); } else return (ptr); - } /*emalloc */ /*------------------------------------------------------------------------ @@ -80,10 +77,7 @@ emalloc(size) *------------------------------------------------------------------------*/ char * -ecalloc(nelem, size) - unsigned nelem; - unsigned size; - +ecalloc(unsigned int nelem, unsigned int size) { /*ecalloc */ char *calloc(); @@ -120,10 +114,7 @@ ecalloc(nelem, size) *------------------------------------------------------------------------*/ FILE * -efopen(filename, type) - char *filename; - char *type; - +efopen(char *filename, char *type) { /*efopen */ FILE *f; diff --git a/src/package/messages.c b/src/package/messages.c index 5d018cc..6da38f4 100644 --- a/src/package/messages.c +++ b/src/package/messages.c @@ -57,11 +57,7 @@ static char * -putnum(dp, n, b) - register char *dp; - register unsigned n; - register int b; - +putnum(register char *dp, register unsigned n, register int b) { /*putnum */ register int s; @@ -79,10 +75,7 @@ putnum(dp, n, b) } /*putnum */ static char * -putstr(dp, s) - register char *dp; - register char *s; - +putstr(register char *dp, register char *s) { /*putstr */ while (*s) @@ -93,11 +86,7 @@ putstr(dp, s) } /*putstr */ static char * -putformat(dp, fp, ap) - register char *dp; - register char *fp; - register va_list ap; - +putformat(register char *dp, register char *fp, register va_list ap) { /*putformat */ while (*fp) { diff --git a/src/package/misc.c b/src/package/misc.c index f4d2d17..8ed56d7 100644 --- a/src/package/misc.c +++ b/src/package/misc.c @@ -19,14 +19,14 @@ yywrap() return 1; } -sprint(s) - char *s; +void +sprint(char *s) { printf("sprint - %s", s); } -allprint(i) - int i; +void +allprint(int i) { printf("allprint - %d\n", i); } diff --git a/src/package/package.c b/src/package/package.c index 927d611..98629bd 100644 --- a/src/package/package.c +++ b/src/package/package.c @@ -204,12 +204,8 @@ getsystype() *------------------------------------------------------------------------*/ static int -packageInit(as, arock) - struct cmd_syndesc *as; - char *arock; - +packageInit(struct cmd_syndesc *as, char *arock) { /*packageInit */ - systype = getsystype(); /* @@ -287,10 +283,8 @@ packageInit(as, arock) #include "AFS_component_version_number.c" -main(argc, argv) - int argc; - char **argv; - +int +main(int argc, char **argv) { /*main */ register afs_int32 code; /*Return code */ diff --git a/src/package/test.c b/src/package/test.c index 20e10f7..6e76d48 100644 --- a/src/package/test.c +++ b/src/package/test.c @@ -44,12 +44,9 @@ int opt_debug = 1; /*Debugging output enabled? */ #include "AFS_component_version_number.c" -main(argc, argv) - int argc; - char **argv; - +int +main(int argc, char **argv) { /*main */ - int code; /*Return code */ if (argc > 1) @@ -62,7 +59,6 @@ main(argc, argv) test_linecounter); if (yyin != stdin) fclose(yyin); - } /*main */ /*------------------------------------------------------------------------ @@ -91,15 +87,9 @@ main(argc, argv) *------------------------------------------------------------------------*/ int -AddRegEntry(f, p, o, m, u) - char *f; - PROTOTYPE p; - OWNER o; - MODE m; - u_short u; +AddRegEntry(char *f, PROTOTYPE p, OWNER o, MODE m, u_short u) { /*AddRegEntry */ - printf("F"); echo_updateoptions(u); printf("%s", f); @@ -107,7 +97,6 @@ AddRegEntry(f, p, o, m, u) echo_ownerinfo(o); echo_modeinfo(m); return (0); - } /*AddRegEntry */ /*------------------------------------------------------------------------ @@ -136,13 +125,7 @@ AddRegEntry(f, p, o, m, u) *------------------------------------------------------------------------*/ int -AddDirEntry(f, p, o, m, u) - char *f; - PROTOTYPE p; - OWNER o; - MODE m; - u_short u; - +AddDirEntry(char *f, PROTOTYPE p, OWNER o, MODE m, u_short u) { /*AddDirEntry */ printf("D"); @@ -181,15 +164,8 @@ AddDirEntry(f, p, o, m, u) *------------------------------------------------------------------------*/ int -AddLnkEntry(f, p, o, m, u) - char *f; - PROTOTYPE p; - OWNER o; - MODE m; - u_short u; - +AddLnkEntry(char *f, PROTOTYPE p, OWNER o, MODE m, u_short u) { /*AddLnkEntry */ - printf("L"); echo_updateoptions(u); printf("%s", f); @@ -197,7 +173,6 @@ AddLnkEntry(f, p, o, m, u) echo_ownerinfo(o); echo_modeinfo(m); return (0); - } /*AddLnkEntry */ /*------------------------------------------------------------------------ @@ -226,15 +201,8 @@ AddLnkEntry(f, p, o, m, u) *------------------------------------------------------------------------*/ int -AddBlkEntry(f, p, o, m, u) - char *f; - PROTOTYPE p; - OWNER o; - MODE m; - u_short u; - +AddBlkEntry(char *f, PROTOTYPE p, OWNER o, MODE m, u_short u) { /*AddBlkEntry */ - printf("B"); echo_updateoptions(u); printf("%s", f); @@ -242,7 +210,6 @@ AddBlkEntry(f, p, o, m, u) echo_ownerinfo(o); echo_modeinfo(m); return (0); - } /*AddBlkEntry */ /*------------------------------------------------------------------------ @@ -271,15 +238,8 @@ AddBlkEntry(f, p, o, m, u) *------------------------------------------------------------------------*/ int -AddChrEntry(f, p, o, m, u) - char *f; - PROTOTYPE p; - OWNER o; - MODE m; - u_short u; - +AddChrEntry(char *f, PROTOTYPE p, OWNER o, MODE m, u_short u) { /*AddChrEntry */ - printf("C"); echo_updateoptions(u); printf("%s", f); @@ -287,7 +247,6 @@ AddChrEntry(f, p, o, m, u) echo_ownerinfo(o); echo_modeinfo(m); return (0); - } /*AddChrEntry */ /*------------------------------------------------------------------------ @@ -312,9 +271,7 @@ AddChrEntry(f, p, o, m, u) *------------------------------------------------------------------------*/ int -AddSktEntry(f) - char *f; - +AddSktEntry(char *f) { /*AddSktEntry */ printf("S"); @@ -348,15 +305,8 @@ AddSktEntry(f) *------------------------------------------------------------------------*/ int -AddPipeEntry(f, p, o, m, u) - char *f; - PROTOTYPE p; - OWNER o; - MODE m; - u_short u; - +AddPipeEntry(char *f, PROTOTYPE p, OWNER o, MODE m, u_short u) { /*AddPipeEntry */ - printf("P"); echo_updateoptions(u); printf("\t%s\n", f); @@ -364,7 +314,6 @@ AddPipeEntry(f, p, o, m, u) echo_ownerinfo(o); echo_modeinfo(m); return (0); - } /*AddPipeEntry */ /*------------------------------------------------------------------------ @@ -388,11 +337,8 @@ AddPipeEntry(f, p, o, m, u) *------------------------------------------------------------------------*/ int -echo_updateoptions(u) - u_short u; - +echo_updateoptions(u_short u) { /*echo_updateoptions */ - if (u & U_LOSTFOUND) printf("X"); if (u & U_RMEXTRA) @@ -407,7 +353,6 @@ echo_updateoptions(u) printf("Q"); printf("\t"); return (0); - } /*echo_updateoptions */ /*------------------------------------------------------------------------ @@ -431,11 +376,8 @@ echo_updateoptions(u) *------------------------------------------------------------------------*/ int -echo_prototypeinfo(p) - PROTOTYPE p; - +echo_prototypeinfo(PROTOTYPE p) { /*echo_prototypeinfo */ - switch (p.flag) { case P_FILE: printf("\t%s", p.info.path); @@ -454,7 +396,6 @@ echo_prototypeinfo(p) printf("\t[Neither file nor device]"); break; } - } /*echo_prototypeinfo */ /*------------------------------------------------------------------------ @@ -478,11 +419,8 @@ echo_prototypeinfo(p) *------------------------------------------------------------------------*/ int -echo_ownerinfo(o) - OWNER o; - +echo_ownerinfo(OWNER o) { /*echo_ownerinfo */ - if (o.username != NULL) printf("\t%s", o.username); else @@ -491,7 +429,6 @@ echo_ownerinfo(o) printf("\t%s", o.groupname); else printf("\t[No group info]"); - } /*echo_ownerinfo */ /*------------------------------------------------------------------------ @@ -515,17 +452,13 @@ echo_ownerinfo(o) *------------------------------------------------------------------------*/ int -echo_modeinfo(m) - MODE m; - +echo_modeinfo(MODE m) { /*echo_modeinfo */ - if (m.inherit_flag != TRUE) printf("\t%o", m.modeval); else printf("\t[Inherited mode]"); printf("\n"); - } /*echo_modeinfo */ /*------------------------------------------------------------------------ @@ -558,16 +491,8 @@ echo_modeinfo(m) *------------------------------------------------------------------------*/ int -testAddEntry(a_ftype, a_updspecs, a_filename, a_proto, a_owner, a_mode) - u_short a_ftype; - u_short a_updspecs; - char *a_filename; - PROTOTYPE a_proto; - OWNER a_owner; - MODE a_mode; - +testAddEntry(u_short a_ftype, u_short a_updspecs, char *a_filename, PROTOTYPE a_proto, OWNER a_owner, MODE a_mode) { /*testAddEntry */ - switch (a_ftype) { case S_IFREG: /*Regular file */ AddRegEntry(a_filename, a_proto, a_owner, a_mode, a_updspecs); @@ -606,5 +531,4 @@ testAddEntry(a_ftype, a_updspecs, a_filename, a_proto, a_owner, a_mode) break; } /*switch a_ftype */ - } /*testAddEntry */ diff --git a/src/package/update.c b/src/package/update.c index 70d94e1..0e74e09 100644 --- a/src/package/update.c +++ b/src/package/update.c @@ -55,10 +55,7 @@ static FixReg(); /* $$important: these will have to be fixed with an error recovery mechanism */ int -update(np, path) - CTREEPTR np; - char *path; - +update(CTREEPTR np, char *path) { /*update */ switch (np->type) { @@ -94,11 +91,8 @@ update(np, path) } /*update */ -static -UpdateSock(np, path) - CTREEPTR np; - char *path; - +static void +UpdateSock(CTREEPTR np, char *path) { /*UpdateSock */ (void)dochtyp(np, path); @@ -106,11 +100,8 @@ UpdateSock(np, path) } /*UpdateSock */ -static -UpdateDev(np, path) - CTREEPTR np; - char *path; - +static void +UpdateDev(CTREEPTR np, char *path) { /*UpdateDev */ register int ret; @@ -167,11 +158,8 @@ UpdateDev(np, path) } /*UpdateDev */ -static -UpdatePipe(np, path) - CTREEPTR np; - char *path; - +static void +UpdatePipe(CTREEPTR np, char *path) { /*UpdatePipe */ register int ret; @@ -214,11 +202,8 @@ UpdatePipe(np, path) } /*UpdatePipe */ -static -UpdateLnk(np, path) - CTREEPTR np; - char *path; - +static void +UpdateLnk(CTREEPTR np, char *path) { /*UpdateLnk */ register int ret; @@ -260,11 +245,8 @@ UpdateLnk(np, path) } /*UpdateLnk */ -static -UpdateDir(np, path) - CTREEPTR np; - char *path; - +static void +UpdateDir(CTREEPTR np, char *path) { /*UpdateDir */ register int ret; @@ -295,11 +277,8 @@ UpdateDir(np, path) } /*UpdateDir */ -static -UpdateReg(np, path) - CTREEPTR np; - char *path; - +static void +UpdateReg(CTREEPTR np, char *path) { /*UpdateReg */ register int ret; @@ -343,13 +322,9 @@ UpdateReg(np, path) * reboot scenario is true), we return 0. */ -static -dochtyp(np, path) - CTREEPTR np; - char *path; - +static int +dochtyp(CTREEPTR np, char *path) { /*dochtyp */ - if (lstat(path, &stb) < 0) return -1; #ifdef KFLAG @@ -367,16 +342,11 @@ dochtyp(np, path) rm(path); return -1; } - } /*dochtyp */ -static -dochmod(np, path) - CTREEPTR np; - char *path; - +static void +dochmod(CTREEPTR np, char *path) { /*dochmod */ - if ((np->flag & F_MODE) == 0) return; if ((np->mode & ~S_IFMT) == (stb.st_mode & ~S_IFMT)) @@ -384,16 +354,11 @@ dochmod(np, path) loudonly_message("chmod %s %o", path, np->mode & ~S_IFMT); if (!opt_lazy && chmod(path, (int)np->mode & ~S_IFMT) < 0) message("chmod %s; %m", path); - } /*dochmod */ -static -dochown(np, path) - CTREEPTR np; - char *path; - +static void +dochown(CTREEPTR np, char *path) { /*dochown */ - if ((np->flag & F_UID) == 0) np->uid = stb.st_uid; if ((np->flag & F_GID) == 0) @@ -403,16 +368,11 @@ dochown(np, path) loudonly_message("chown %s %d %d", path, np->uid, np->gid); if (!opt_lazy && chown(path, np->uid, np->gid) < 0) message("chown %s; %m", path); - } /*dochown */ -static -dochtim(np, path) - CTREEPTR np; - char *path; - +static void +dochtim(CTREEPTR np, char *path) { /*dochtim */ - struct timeval tm[2]; if (np->mtime == stb.st_mtime @@ -429,28 +389,19 @@ dochtim(np, path) } if (!opt_lazy && utimes(path, tm) < 0) message("utimes %s; %m", path); - } /*dochtim */ static int -FixLostFoundDir(path) - char *path; - +FixLostFoundDir(char *path) { /*FixLostFoundDir */ - if (stb.st_size >= 3584) return 0; return mklostfound(path); - } /*FixLostFoundDir */ static int -FixDir(np, path) - CTREEPTR np; - char *path; - +FixDir(CTREEPTR np, char *path) { /*FixDir */ - register DIR *dp; register struct dirent *de; register char *endp; @@ -477,16 +428,11 @@ FixDir(np, path) *--endp = 0; (void)closedir(dp); return 0; - } /*FixDir */ -static -FixReg(np, path) - CTREEPTR np; - char *path; - +static int +FixReg(CTREEPTR np, char *path) { /*FixReg */ - char new[MAXPATHLEN], old[MAXPATHLEN], temp[MAXPATHLEN]; if (!opt_reboot && (np->updtspec & U_REBOOT)) { @@ -511,5 +457,4 @@ FixReg(np, path) if (np->updtspec & U_REBOOT) status = status_reboot; return 0; - } /*FixReg */ diff --git a/src/ptserver/db_verify.c b/src/ptserver/db_verify.c index 205b2fe..47861a8 100644 --- a/src/ptserver/db_verify.c +++ b/src/ptserver/db_verify.c @@ -69,8 +69,7 @@ char *whoami = "db_verify"; #define UBIK_HEADERSIZE 64 afs_int32 -printheader(h) - struct prheader *h; +printheader(struct prheader *h) { printf("Version = %d\n", ntohl(h->version)); printf("Header Size = %d\n", ntohl(h->headerSize)); @@ -91,10 +90,7 @@ printheader(h) } static afs_int32 -pr_Read(pos, buff, len) - afs_int32 pos; - char *buff; - afs_int32 len; +pr_Read(afs_int32 pos, char *buff, afs_int32 len) { afs_int32 code; @@ -140,16 +136,14 @@ ReadHeader() } static afs_int32 -IDHash(x) - afs_int32 x; +IDHash(afs_int32 x) { /* returns hash bucket for x */ return ((abs(x)) % HASHSIZE); } static afs_int32 -NameHash(aname) - register unsigned char *aname; +NameHash(register unsigned char *aname) { /* returns hash bucket for aname */ register unsigned int hash = 0; @@ -208,8 +202,7 @@ int idcount(struct idused **idmapp, int id); #endif int -readUbikHeader(misc) - struct misc_data *misc; +readUbikHeader(struct misc_data *misc) { int offset, r; struct ubik_hdr uheader; @@ -252,9 +245,7 @@ readUbikHeader(misc) } afs_int32 -ConvertDiskAddress(ea, eiP) - afs_uint32 ea; - int *eiP; +ConvertDiskAddress(afs_uint32 ea, int *eiP) { int i; @@ -274,11 +265,7 @@ ConvertDiskAddress(ea, eiP) } int -PrintEntryError(misc, ea, e, indent) - struct misc_data *misc; - afs_int32 ea; - struct prentry *e; - int indent; +PrintEntryError(struct misc_data *misc, afs_int32 ea, struct prentry *e, int indent) { pr_PrintEntry(stderr, /*net order */ 0, ea, e, indent); @@ -286,11 +273,10 @@ PrintEntryError(misc, ea, e, indent) } afs_int32 -WalkHashTable(hashtable, hashType, map, misc) - afs_int32 hashtable[]; /* hash table to walk */ - int hashType; /* hash function to use */ - char map[]; /* one byte per db entry */ - struct misc_data *misc; /* stuff to keep track of */ +WalkHashTable(afs_int32 hashtable[], /* hash table to walk */ + int hashType, /* hash function to use */ + char map[], /* one byte per db entry */ + struct misc_data *misc) /* stuff to keep track of */ { afs_int32 code; int hi; /* index in hash table */ @@ -404,11 +390,9 @@ WalkHashTable(hashtable, hashType, map, misc) } afs_int32 -WalkNextChain(map, misc, ea, e) - char map[]; /* one byte per db entry */ - struct misc_data *misc; /* stuff to keep track of */ - afs_int32 ea; - struct prentry *e; +WalkNextChain(char map[], /* one byte per db entry */ + struct misc_data *misc, /* stuff to keep track of */ + afs_int32 ea, struct prentry *e) { afs_int32 head; int bit; @@ -725,11 +709,9 @@ WalkNextChain(map, misc, ea, e) } afs_int32 -WalkOwnedChain(map, misc, ea, e) - char map[]; /* one byte per db entry */ - struct misc_data *misc; /* stuff to keep track of */ - afs_int32 ea; - struct prentry *e; +WalkOwnedChain(char map[], /* one byte per db entry */ + struct misc_data *misc, /* stuff to keep track of */ + afs_int32 ea, struct prentry *e) { afs_int32 head; afs_int32 code; @@ -809,9 +791,8 @@ WalkOwnedChain(map, misc, ea, e) } afs_int32 -WalkChains(map, misc) - char map[]; /* one byte per db entry */ - struct misc_data *misc; /* stuff to keep track of */ +WalkChains(char map[], /* one byte per db entry */ + struct misc_data *misc) /* stuff to keep track of */ { afs_int32 code; int ei; @@ -924,9 +905,7 @@ WalkChains(map, misc) } afs_int32 -GC(map, misc) - char map[]; - struct misc_data *misc; +GC(char map[], struct misc_data *misc) { afs_int32 code; int ei; @@ -958,13 +937,14 @@ GC(map, misc) id = ntohl(e.id); #if defined(SUPERGROUPS) if ((id != ANONYMOUSID) - && ((refCount = idcount(&misc->idmap, id)) != ntohl(e.count))) { + && ((refCount = idcount(&misc->idmap, id)) != ntohl(e.count))) #else if ((id >= misc->minId) && (id <= misc->maxId) && (id != ANONYMOUSID) && ((refCount = misc->idmap[id - misc->minId]) != - ntohl(e.count))) { + ntohl(e.count))) #endif /* SUPERGROUPS */ + { afs_int32 na; fprintf(stderr, "Entry membership count is inconsistent: %d entries refer to this one\n", @@ -991,8 +971,7 @@ GC(map, misc) } char * -QuoteName(s) - char *s; +QuoteName(char *s) { char *qs; if (strpbrk(s, " \t")) { @@ -1006,9 +985,7 @@ QuoteName(s) } afs_int32 -DumpRecreate(map, misc) - char map[]; - struct misc_data *misc; +DumpRecreate(char map[], struct misc_data *misc) { afs_int32 code; int ei; @@ -1069,10 +1046,11 @@ DumpRecreate(map, misc) /* check for duplicate id. This may still lead to duplicate * names. */ #if defined(SUPERGROUPS) - if (idcount(&idmap, id)) { + if (idcount(&idmap, id)) #else - if (idmap[id - misc->minId]) { + if (idmap[id - misc->minId]) #endif + { fprintf(stderr, "Skipping entry with duplicate id %di\n", id); goto user_done; @@ -1179,10 +1157,11 @@ DumpRecreate(map, misc) owner = ntohl(e.owner); #if defined(SUPERGROUPS) - if (!idcount(&idmap, owner)) { + if (!idcount(&idmap, owner)) #else - if (idmap[owner - misc->minId] == 0) { + if (idmap[owner - misc->minId] == 0) #endif + { fprintf(stderr, "Skipping chown of '%s' to non-existant owner %di\n", e.name, owner); @@ -1310,8 +1289,7 @@ DumpRecreate(map, misc) } afs_int32 -CheckPrDatabase(misc) - struct misc_data *misc; /* info & statistics */ +CheckPrDatabase(struct misc_data *misc) /* info & statistics */ { afs_int32 code; afs_int32 eof; @@ -1450,12 +1428,11 @@ CheckPrDatabase(misc) free(map); return code; } - + #include "AFS_component_version_number.c" -WorkerBee(as, arock) - struct cmd_syndesc *as; - char *arock; +int +WorkerBee(struct cmd_syndesc *as, char *arock) { afs_int32 code; char *recreateFile; @@ -1508,9 +1485,8 @@ WorkerBee(as, arock) exit(0); } -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { struct cmd_syndesc *ts; @@ -1536,8 +1512,7 @@ main(argc, argv) /* new routines to deal with very large ID numbers */ void -zeromap(idmap) - struct idused *idmap; +zeromap(struct idused *idmap) { while (idmap) { bzero((char *)idmap->idcount, sizeof idmap->idcount); @@ -1574,8 +1549,7 @@ inccount(struct idused **idmapp, int id) } int -idcount(idmapp, id) - struct idused **idmapp; +idcount(struct idused **idmapp, int id) { struct idused *idmap; @@ -1591,5 +1565,4 @@ idcount(idmapp, id) } return 0; } - #endif /* SUPERGROUPS */ diff --git a/src/ptserver/display.c b/src/ptserver/display.c index fb72015..4ac88b4 100644 --- a/src/ptserver/display.c +++ b/src/ptserver/display.c @@ -62,12 +62,7 @@ pr_TimeToString(time_t clock) #define host(a) (hostOrder ? (a) : ntohl(a)) static void -PrintEntries(f, hostOrder, indent, e, n) - FILE *f; - int hostOrder; /* structures in host order */ - int indent; - struct prentry *e; - int n; +PrintEntries(FILE *f, int hostOrder, int indent, struct prentry *e, int n) { int i; int newline; @@ -98,12 +93,7 @@ PrintEntries(f, hostOrder, indent, e, n) } int -pr_PrintEntry(f, hostOrder, ea, e, indent) - FILE *f; - int hostOrder; /* structures in host order */ - afs_int32 ea; - struct prentry *e; - int indent; +pr_PrintEntry(FILE *f, int hostOrder, afs_int32 ea, struct prentry *e, int indent) { int i; diff --git a/src/ptserver/map.c b/src/ptserver/map.c index 6afe7e2..ce6a733 100644 --- a/src/ptserver/map.c +++ b/src/ptserver/map.c @@ -69,15 +69,8 @@ struct bitmap { #define Aflag (debug_mask & (1L<<('Z'-'@'))) extern int debug_mask; -#if __STDC__ int in_map(struct map *parm, long node) -#else -int -in_map(parm, node) - struct map *parm; - long node; -#endif { struct bitmap *map; long bit; @@ -117,8 +110,7 @@ in_map(parm, node) } void -free_map(parm) - struct map *parm; +free_map(struct map *parm) { struct bitmap *map, *next; #ifdef MAP_DEBUG @@ -137,9 +129,7 @@ free_map(parm) } struct map * -add_map(parm, node) - struct map *parm; - long node; +add_map(struct map *parm, long node) { struct bitmap *map; long bit; @@ -198,8 +188,7 @@ add_map(parm, node) } struct bitmap * -simplify_bitmap(map) - struct bitmap *map; +simplify_bitmap(struct bitmap *map) { struct bitmap **mpp, *mp2; int i; @@ -221,8 +210,7 @@ simplify_bitmap(map) } struct bitmap * -or_bitmap(left, right) - struct bitmap *left, *right; +or_bitmap(struct bitmap *left, struct bitmap *right) { struct bitmap **rightmp, *lmap, *rmap; int i; @@ -242,8 +230,7 @@ or_bitmap(left, right) } struct bitmap * -and_bitmap(left, right) - struct bitmap *left, *right; +and_bitmap(struct bitmap *left, struct bitmap *right) { struct bitmap **rightmp, *lmap, *rmap, **leftmp; int i; @@ -271,8 +258,7 @@ and_bitmap(left, right) /* bit set in left, but not in right */ struct bitmap * -bic_bitmap(left, right) - struct bitmap *left, *right; +bic_bitmap(struct bitmap *left, struct bitmap *right) { struct bitmap **rightmp, *lmap, *rmap, **leftmp; int i; @@ -310,8 +296,7 @@ bic_bitmap(left, right) } struct map * -and_map(mp1, mp2) - struct map *mp1, *mp2; +and_map(struct map *mp1, struct map *mp2) { #ifdef MAP_DEBUG if (Mflag) { @@ -341,8 +326,7 @@ and_map(mp1, mp2) } struct map * -or_map(mp1, mp2) - struct map *mp1, *mp2; +or_map(struct map *mp1, struct map *mp2) { #ifdef MAP_DEBUG if (Mflag) { @@ -372,8 +356,7 @@ or_map(mp1, mp2) } struct map * -not_map(map) - struct map *map; +not_map(struct map *map) { #ifdef MAP_DEBUG if (Mflag) { @@ -386,8 +369,7 @@ not_map(map) } struct map * -copy_map(parm) - struct map *parm; +copy_map(struct map *parm) { struct bitmap *result, **mpp, *map; #ifdef MAP_DEBUG @@ -419,8 +401,7 @@ copy_map(parm) } long -count_map(parm) - struct map *parm; +count_map(struct map *parm) { long nf; struct bitmap *map; @@ -451,9 +432,7 @@ count_map(parm) } long -next_map(parm, node) - struct map *parm; - long node; +next_map(struct map *parm, long node) { struct bitmap *map, *lowest; long bit, mask; @@ -525,16 +504,13 @@ next_map(parm, node) } long -first_map(parm) - struct map *parm; +first_map(struct map *parm) { return next_map(parm, -9999); } long -prev_map(parm, node) - struct map *parm; - long node; +prev_map(struct map *parm, long node) { struct bitmap *map, *lowest; long bit, mask; @@ -609,22 +585,19 @@ prev_map(parm, node) } long -last_map(parm) - struct map *parm; +last_map(struct map *parm) { return prev_map(parm, 0x7fffffff); } struct map * -negative_map(map) - struct map *map; +negative_map(struct map *map) { return (struct map *)NEGMAP(map); } struct map * -bic_map(mp1, mp2) - struct map *mp1, *mp2; +bic_map(struct map *mp1, struct map *mp2) { #ifdef MAP_DEBUG if (Mflag) { @@ -646,8 +619,8 @@ bic_map(mp1, mp2) } #ifdef PRINT_MAP_ERROR -print_map(parm) - struct map *parm; +void +print_map(struct map *parm) { struct bitmap *map; int i, j; @@ -694,9 +667,7 @@ print_map(parm) #ifdef NEED_READ_WRITE struct map * -read_map(f, arg) - int (*f) (); - char *arg; +read_map(int (*f) (), char *arg) { struct bitmap *map, *result, **mp; int page; @@ -752,10 +723,8 @@ read_map(f, arg) return (struct map *)result; } -write_map(parm, f, arg) - struct map *parm; - int (*f) (); - char *arg; +int +write_map(struct map *parm, int (*f) (), char *arg) { struct bitmap *map; int page; diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c index beaf697..8e213f4 100644 --- a/src/ptserver/pt_util.c +++ b/src/ptserver/pt_util.c @@ -97,9 +97,8 @@ int nflag = 0; int wflag = 0; int flags = 0; -main(argc, argv) - int argc; - char **argv; +int +main(int argc, char **argv) { register struct cmd_syndesc *cs; /*Command line syntax descriptor */ @@ -129,8 +128,7 @@ main(argc, argv) } int -CommandProc(a_as) - register struct cmd_syndesc *a_as; +CommandProc(register struct cmd_syndesc *a_as) { register int i; register long code; @@ -342,8 +340,7 @@ CommandProc(a_as) } int -display_entry(offset) - int offset; +display_entry(int offset) { register int i; @@ -367,8 +364,7 @@ display_entry(offset) } void -add_group(id) - long id; +add_group(long id) { struct grp_list *g; register long i; @@ -403,8 +399,7 @@ display_groups() } void -display_group(id) - int id; +display_group(int id) { register int i, offset; int print_grp = 0; @@ -475,8 +470,7 @@ display_group(id) } void -fix_pre(pre) - struct prentry *pre; +fix_pre(struct prentry *pre) { register int i; @@ -503,8 +497,7 @@ fix_pre(pre) } char * -id_to_name(id) - int id; +id_to_name(int id) { register int offset; static struct prentry pre; @@ -531,8 +524,7 @@ id_to_name(id) } char * -checkin(pre) - struct prentry *pre; +checkin(struct prentry *pre) { struct hash_entry *he, *last; register int id; @@ -562,8 +554,7 @@ checkin(pre) } char * -check_core(id) - register int id; +check_core(register int id) { struct hash_entry *he; he = hat[IDHash(id)]; diff --git a/src/ptserver/pts.c b/src/ptserver/pts.c index 443b7fa..dce5786 100644 --- a/src/ptserver/pts.c +++ b/src/ptserver/pts.c @@ -73,24 +73,21 @@ struct sourcestack { } *shead; int -Interactive(as) - register struct cmd_syndesc *as; +Interactive(register struct cmd_syndesc *as) { finished = 0; return 0; } int -Quit(as) - register struct cmd_syndesc *as; +Quit(register struct cmd_syndesc *as) { finished = 1; return 0; } int -Source(as) - register struct cmd_syndesc *as; +Source(register struct cmd_syndesc *as) { FILE *fd; struct sourcestack *sp; @@ -118,8 +115,7 @@ Source(as) } int -Sleep(as) - register struct cmd_syndesc *as; +Sleep(register struct cmd_syndesc *as) { int delay; if (!as->parms[0].items) { @@ -157,8 +153,7 @@ osi_audit() } int -GetGlobals(as) - register struct cmd_syndesc *as; +GetGlobals(register struct cmd_syndesc *as) { register afs_int32 code; char *cell; @@ -190,8 +185,7 @@ GetGlobals(as) } int -CleanUp(as) - register struct cmd_syndesc *as; +CleanUp(register struct cmd_syndesc *as) { #if defined(SUPERGROUPS) if (as && !strcmp(as->name, "help")) @@ -212,8 +206,8 @@ CleanUp(as) return 0; } -CreateGroup(as) - register struct cmd_syndesc *as; +int +CreateGroup(register struct cmd_syndesc *as) { register afs_int32 code; afs_int32 id; @@ -272,8 +266,8 @@ CreateGroup(as) return 0; } -CreateUser(as) - register struct cmd_syndesc *as; +int +CreateUser(register struct cmd_syndesc *as) { register afs_int32 code; afs_int32 id; @@ -319,10 +313,7 @@ CreateUser(as) #ifdef notdef int -GetNameOrId(as, lids, lnames) - register struct cmd_syndesc *as; - struct idlist *lids; - struct namelist *lnames; +GetNameOrId(register struct cmd_syndesc *as, struct idlist *lids, struct namelist *lnames) { register afs_int32 code = 0; int n = 0; @@ -413,10 +404,7 @@ GetNameOrId(as, lids, lnames) int -GetNameOrId(as, lids, lnames) - register struct cmd_syndesc *as; - struct idlist *lids; - struct namelist *lnames; +GetNameOrId(register struct cmd_syndesc *as, struct idlist *lids, struct namelist *lnames) { register afs_int32 code = 0; int n = 0, nd = 0, nm = 0, id, x; @@ -503,8 +491,8 @@ GetNameOrId(as, lids, lnames) } -AddToGroup(as) - register struct cmd_syndesc *as; +int +AddToGroup(register struct cmd_syndesc *as) { register afs_int32 code; struct cmd_item *u, *g; @@ -524,8 +512,8 @@ AddToGroup(as) return 0; } -RemoveFromGroup(as) - register struct cmd_syndesc *as; +int +RemoveFromGroup(register struct cmd_syndesc *as) { register afs_int32 code; struct cmd_item *u, *g; @@ -545,8 +533,8 @@ RemoveFromGroup(as) return 0; } -ListMembership(as) - register struct cmd_syndesc *as; +int +ListMembership(register struct cmd_syndesc *as) { register afs_int32 code; idlist ids; @@ -590,8 +578,8 @@ ListMembership(as) return 0; } -Delete(as) - register struct cmd_syndesc *as; +int +Delete(register struct cmd_syndesc *as) { register afs_int32 code; idlist ids; @@ -629,8 +617,8 @@ char *flags_upcase = "SOMA "; /* legal all access values */ char *flags_dncase = "s mar"; /* legal member acces values */ int flags_shift[5] = { 2, 1, 2, 2, 1 }; /* bits for each */ -CheckEntry(as) - register struct cmd_syndesc *as; +int +CheckEntry(register struct cmd_syndesc *as) { register afs_int32 code; afs_int32 rcode = 1; @@ -728,8 +716,8 @@ CheckEntry(as) return (rcode); } -ListEntries(as) - struct cmd_syndesc *as; +int +ListEntries(struct cmd_syndesc *as) { afs_int32 code = 0; afs_int32 flag, startindex, nentries, nextstartindex; @@ -765,8 +753,8 @@ ListEntries(as) return code; } -ChownGroup(as) - register struct cmd_syndesc *as; +int +ChownGroup(register struct cmd_syndesc *as) { register afs_int32 code; char *name; @@ -781,8 +769,8 @@ ChownGroup(as) return code; } -ChangeName(as) - register struct cmd_syndesc *as; +int +ChangeName(register struct cmd_syndesc *as) { register afs_int32 code; char *oldname; @@ -797,8 +785,8 @@ ChangeName(as) return code; } -ListMax(as) - register struct cmd_syndesc *as; +int +ListMax(register struct cmd_syndesc *as) { register afs_int32 code; afs_int32 maxUser, maxGroup; @@ -818,8 +806,8 @@ ListMax(as) return code; } -SetMax(as) - register struct cmd_syndesc *as; +int +SetMax(register struct cmd_syndesc *as) { register afs_int32 code; afs_int32 maxid; @@ -858,8 +846,8 @@ SetMax(as) return code; } -SetFields(as) - register struct cmd_syndesc *as; +int +SetFields(register struct cmd_syndesc *as) { register afs_int32 code; idlist ids; @@ -953,8 +941,8 @@ SetFields(as) return 0; } -ListOwned(as) - register struct cmd_syndesc *as; +int +ListOwned(register struct cmd_syndesc *as) { register afs_int32 code; idlist ids; @@ -1004,8 +992,7 @@ ListOwned(as) } static void -add_std_args(ts) - register struct cmd_syndesc *ts; +add_std_args(register struct cmd_syndesc *ts) { char test_help[AFSDIR_PATH_MAX]; @@ -1031,9 +1018,7 @@ static void add_NameOrId_args (ts) #include "AFS_component_version_number.c" int -main(argc, argv) - int argc; - char **argv; +main(int argc, char **argv) { register afs_int32 code; register struct cmd_syndesc *ts; diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index 8d39d10..3d797b4 100644 --- a/src/ptserver/ptserver.c +++ b/src/ptserver/ptserver.c @@ -195,8 +195,7 @@ prp_access_mask(s) /* check whether caller is authorized to manage RX statistics */ int -pr_rxstat_userok(call) - struct rx_call *call; +pr_rxstat_userok(struct rx_call *call) { return afsconf_SuperUser(prdir, call, NULL); } diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c index dbf18f2..bbbc09b 100644 --- a/src/ptserver/ptuser.c +++ b/src/ptserver/ptuser.c @@ -64,10 +64,7 @@ static afs_int32 lastLevel; /* security level pruclient, if any */ static char *whoami = "libprot"; afs_int32 -pr_Initialize(secLevel, confDir, cell) - IN afs_int32 secLevel; - IN char *confDir; - IN char *cell; +pr_Initialize(IN afs_int32 secLevel, IN char *confDir, IN char *cell) { afs_int32 code; struct rx_connection *serverconns[MAXSERVERS]; @@ -212,7 +209,7 @@ pr_Initialize(secLevel, confDir, cell) return code; } - +int pr_End() { int code = 0; @@ -226,9 +223,8 @@ pr_End() -pr_CreateUser(name, id) - char name[PR_MAXNAMELEN]; - afs_int32 *id; +int +pr_CreateUser(char name[PR_MAXNAMELEN], afs_int32 *id) { register afs_int32 code; @@ -243,10 +239,8 @@ pr_CreateUser(name, id) } -pr_CreateGroup(name, owner, id) - char name[PR_MAXNAMELEN]; - char owner[PR_MAXNAMELEN]; - afs_int32 *id; +int +pr_CreateGroup(char name[PR_MAXNAMELEN], char owner[PR_MAXNAMELEN], afs_int32 *id) { register afs_int32 code; afs_int32 oid = 0; @@ -270,8 +264,8 @@ pr_CreateGroup(name, owner, id) } } -pr_Delete(name) - char *name; +int +pr_Delete(char *name) { register afs_int32 code; afs_int32 id; @@ -286,8 +280,8 @@ pr_Delete(name) return code; } -pr_DeleteByID(id) - afs_int32 id; +int +pr_DeleteByID(afs_int32 id) { register afs_int32 code; @@ -295,9 +289,8 @@ pr_DeleteByID(id) return code; } -pr_AddToGroup(user, group) - char *user; - char *group; +int +pr_AddToGroup(char *user, char *group) { register afs_int32 code; namelist lnames; @@ -329,9 +322,8 @@ pr_AddToGroup(user, group) return code; } -pr_RemoveUserFromGroup(user, group) - char *user; - char *group; +int +pr_RemoveUserFromGroup(char *user, char *group) { register afs_int32 code; namelist lnames; @@ -364,9 +356,8 @@ pr_RemoveUserFromGroup(user, group) } -pr_NameToId(names, ids) - namelist *names; - idlist *ids; +int +pr_NameToId(namelist *names, idlist *ids) { register afs_int32 code; register afs_int32 i; @@ -377,9 +368,8 @@ pr_NameToId(names, ids) return code; } -pr_SNameToId(name, id) - char name[PR_MAXNAMELEN]; - afs_int32 *id; +int +pr_SNameToId(char name[PR_MAXNAMELEN], afs_int32 *id) { namelist lnames; idlist lids; @@ -401,11 +391,8 @@ pr_SNameToId(name, id) return code; } - - -pr_IdToName(ids, names) - idlist *ids; - namelist *names; +int +pr_IdToName(idlist *ids, namelist *names) { register afs_int32 code; @@ -413,9 +400,8 @@ pr_IdToName(ids, names) return code; } -pr_SIdToName(id, name) - afs_int32 id; - char name[PR_MAXNAMELEN]; +int +pr_SIdToName(afs_int32 id, char name[PR_MAXNAMELEN]) { namelist lnames; idlist lids; @@ -436,11 +422,8 @@ pr_SIdToName(id, name) return code; } - - -pr_GetCPS(id, CPS) - afs_int32 id; - prlist *CPS; +int +pr_GetCPS(afs_int32 id, prlist *CPS) { register afs_int32 code; afs_int32 over; @@ -458,11 +441,8 @@ pr_GetCPS(id, CPS) return 0; } - -pr_GetCPS2(id, host, CPS) - afs_int32 id; - afs_int32 host; - prlist *CPS; +int +pr_GetCPS2(afs_int32 id, afs_int32 host, prlist *CPS) { register afs_int32 code; afs_int32 over; @@ -480,9 +460,8 @@ pr_GetCPS2(id, host, CPS) return 0; } -pr_GetHostCPS(host, CPS) - afs_int32 host; - prlist *CPS; +int +pr_GetHostCPS(afs_int32 host, prlist *CPS) { register afs_int32 code; afs_int32 over; @@ -501,10 +480,8 @@ pr_GetHostCPS(host, CPS) return 0; } - -pr_ListMembers(group, lnames) - char *group; - namelist *lnames; +int +pr_ListMembers(char *group, namelist *lnames) { register afs_int32 code; afs_int32 gid; @@ -518,10 +495,8 @@ pr_ListMembers(group, lnames) return code; } -pr_ListOwned(oid, lnames, moreP) - afs_int32 oid; - namelist *lnames; - afs_int32 *moreP; +int +pr_ListOwned(afs_int32 oid, namelist *lnames, afs_int32 *moreP) { register afs_int32 code; prlist alist; @@ -547,9 +522,8 @@ pr_ListOwned(oid, lnames, moreP) return PRSUCCESS; } -pr_IDListMembers(gid, lnames) - afs_int32 gid; - namelist *lnames; +int +pr_IDListMembers(afs_int32 gid, namelist *lnames) { register afs_int32 code; prlist alist; @@ -574,10 +548,8 @@ pr_IDListMembers(gid, lnames) return PRSUCCESS; } - -pr_ListEntry(id, aentry) - afs_int32 id; - struct prcheckentry *aentry; +int +pr_ListEntry(afs_int32 id, struct prcheckentry *aentry) { register afs_int32 code; @@ -586,11 +558,7 @@ pr_ListEntry(id, aentry) } afs_int32 -pr_ListEntries(flag, startindex, nentries, entries, nextstartindex) - afs_int32 startindex; - afs_int32 *nentries; - struct prlistentries **entries; - afs_int32 *nextstartindex; +pr_ListEntries(int flag, afs_int32 startindex, afs_int32 *nentries, struct prlistentries **entries, afs_int32 *nextstartindex) { afs_int32 code; prentries bulkentries; @@ -609,11 +577,8 @@ pr_ListEntries(flag, startindex, nentries, entries, nextstartindex) return code; } -pr_CheckEntryByName(name, id, owner, creator) - char *name; - afs_int32 *id; - char *owner; - char *creator; +int +pr_CheckEntryByName(char *name, afs_int32 *id, char *owner, char *creator) { /* struct prcheckentry returns other things, which aren't useful to show at this time. */ register afs_int32 code; @@ -637,11 +602,8 @@ pr_CheckEntryByName(name, id, owner, creator) return PRSUCCESS; } -pr_CheckEntryById(name, id, owner, creator) - char *name; - afs_int32 id; - char *owner; - char *creator; +int +pr_CheckEntryById(char *name, afs_int32 id, char *owner, char *creator) { /* struct prcheckentry returns other things, which aren't useful to show at this time. */ register afs_int32 code; @@ -665,11 +627,8 @@ pr_CheckEntryById(name, id, owner, creator) return PRSUCCESS; } -pr_ChangeEntry(oldname, newname, newid, newowner) - char *oldname; - char *newname; - afs_int32 *newid; - char *newowner; +int +pr_ChangeEntry(char *oldname, char *newname, afs_int32 *newid, char *newowner) { register afs_int32 code; afs_int32 id; @@ -691,10 +650,8 @@ pr_ChangeEntry(oldname, newname, newid, newowner) return code; } -pr_IsAMemberOf(uname, gname, flag) - char *uname; - char *gname; - afs_int32 *flag; +int +pr_IsAMemberOf(char *uname, char *gname, afs_int32 *flag) { register afs_int32 code; namelist lnames; @@ -726,9 +683,8 @@ pr_IsAMemberOf(uname, gname, flag) return code; } - -pr_ListMaxUserId(mid) - afs_int32 *mid; +int +pr_ListMaxUserId(afs_int32 *mid) { register afs_int32 code; afs_int32 gid; @@ -736,8 +692,8 @@ pr_ListMaxUserId(mid) return code; } -pr_SetMaxUserId(mid) - afs_int32 mid; +int +pr_SetMaxUserId(afs_int32 mid) { register afs_int32 code; afs_int32 flag = 0; @@ -745,8 +701,8 @@ pr_SetMaxUserId(mid) return code; } -pr_ListMaxGroupId(mid) - afs_int32 *mid; +int +pr_ListMaxGroupId(afs_int32 *mid) { register afs_int32 code; afs_int32 id; @@ -754,8 +710,8 @@ pr_ListMaxGroupId(mid) return code; } -pr_SetMaxGroupId(mid) - afs_int32 mid; +int +pr_SetMaxGroupId(afs_int32 mid) { register afs_int32 code; afs_int32 flag = 0; @@ -766,10 +722,7 @@ pr_SetMaxGroupId(mid) } afs_int32 -pr_SetFieldsEntry(id, mask, flags, ngroups, nusers) - afs_int32 id; - afs_int32 mask; - afs_int32 flags, ngroups, nusers; +pr_SetFieldsEntry(afs_int32 id, afs_int32 mask, afs_int32 flags, afs_int32 ngroups, afs_int32 nusers) { register afs_int32 code; @@ -779,10 +732,8 @@ pr_SetFieldsEntry(id, mask, flags, ngroups, nusers) return code; } - int -stolower(s) - char *s; +stolower(char *s) { while (*s) { if (isupper(*s)) diff --git a/src/ptserver/ptutils.c b/src/ptserver/ptutils.c index acce83a..176fe72 100644 --- a/src/ptserver/ptutils.c +++ b/src/ptserver/ptutils.c @@ -94,10 +94,7 @@ int prp_group_default = PRP_GROUP_DEFAULT; int (*pt_save_dbase_write) (); int -pt_mywrite(tdb, fno, bp, pos, count) - struct ubik_dbase *tdb; - afs_int32 fno, pos, count; - char *bp; +pt_mywrite(struct ubik_dbase *tdb, afs_int32 fno, char *bp, afs_int32 pos, afs_int32 count) { afs_uint32 headersize = ntohl(cheader.headerSize); @@ -191,6 +188,7 @@ pt_mywrite(tdb, fno, bp, pos, count) * just after ubik_ServerInit. */ +void pt_hook_write() { extern struct ubik_dbase *ubik_dbase; @@ -211,8 +209,7 @@ pt_hook_write() * return one if name is OK and zero if name is bogus. */ static int -CorrectUserName(name) - char *name; +CorrectUserName(char *name) { extern int pr_realmNameLen; @@ -230,12 +227,10 @@ CorrectUserName(name) * rename, which then compares the correct name with the requested new name. */ static afs_int32 -CorrectGroupName(ut, aname, cid, oid, cname) - struct ubik_trans *ut; - char aname[PR_MAXNAMELEN]; /* name for group */ - afs_int32 cid; /* caller id */ - afs_int32 oid; /* owner of group */ - char cname[PR_MAXNAMELEN]; /* correct name for group */ +CorrectGroupName(struct ubik_trans *ut, char aname[PR_MAXNAMELEN], /* name for group */ + afs_int32 cid, /* caller id */ + afs_int32 oid, /* owner of group */ + char cname[PR_MAXNAMELEN]) /* correct name for group */ { afs_int32 code; int admin; @@ -311,12 +306,10 @@ CorrectGroupName(ut, aname, cid, oid, cname) } int -AccessOK(ut, cid, tentry, mem, any) - struct ubik_trans *ut; - afs_int32 cid; /* caller id */ - struct prentry *tentry; /* object being accessed */ - int mem; /* check membership in aid, if group */ - int any; /* if set return true */ +AccessOK(struct ubik_trans *ut, afs_int32 cid, /* caller id */ + struct prentry *tentry, /* object being accessed */ + int mem, /* check membership in aid, if group */ + int any) /* if set return true */ { afs_int32 flags; afs_int32 oid; @@ -363,14 +356,7 @@ AccessOK(ut, cid, tentry, mem, any) } afs_int32 -CreateEntry(at, aname, aid, idflag, flag, oid, creator) - struct ubik_trans *at; - char aname[PR_MAXNAMELEN]; - afs_int32 *aid; - afs_int32 idflag; - afs_int32 flag; - afs_int32 oid; - afs_int32 creator; +CreateEntry(struct ubik_trans *at, char aname[PR_MAXNAMELEN], afs_int32 *aid, afs_int32 idflag, afs_int32 flag, afs_int32 oid, afs_int32 creator) { /* get and init a new entry */ afs_int32 code; @@ -636,10 +622,7 @@ CreateEntry(at, aname, aid, idflag, flag, oid, creator) * entry if appropriate */ afs_int32 -RemoveFromEntry(at, aid, bid) - struct ubik_trans *at; - afs_int32 aid; - afs_int32 bid; +RemoveFromEntry(struct ubik_trans *at, afs_int32 aid, afs_int32 bid) { afs_int32 code; struct prentry tentry; @@ -727,11 +710,7 @@ RemoveFromEntry(at, aid, bid) * entry if appropriate */ afs_int32 -ChangeIDEntry(at, aid, newid, bid) - register struct ubik_trans *at; - register afs_int32 aid; - register afs_int32 bid; - afs_int32 newid; +ChangeIDEntry(register struct ubik_trans *at, register afs_int32 aid, afs_int32 newid, register afs_int32 bid) { register afs_int32 code; struct prentry tentry; @@ -799,10 +778,7 @@ ChangeIDEntry(at, aid, newid, bid) * continuation entry if appropriate */ afs_int32 -RemoveFromSGEntry(at, aid, bid) - register struct ubik_trans *at; - register afs_int32 aid; - register afs_int32 bid; +RemoveFromSGEntry(register struct ubik_trans *at, register afs_int32 aid, register afs_int32 bid) { register afs_int32 code; struct prentry tentry; @@ -900,10 +876,7 @@ RemoveFromSGEntry(at, aid, bid) * groups, putting groups owned by it on orphan chain, and freeing the space */ afs_int32 -DeleteEntry(at, tentry, loc) - struct ubik_trans *at; - struct prentry *tentry; - afs_int32 loc; +DeleteEntry(struct ubik_trans *at, struct prentry *tentry, afs_int32 loc) { afs_int32 code; struct contentry centry; @@ -1054,11 +1027,7 @@ DeleteEntry(at, tentry, loc) * Note the entry is written out by this routine. */ afs_int32 -AddToEntry(tt, entry, loc, aid) - struct ubik_trans *tt; - struct prentry *entry; - afs_int32 loc; - afs_int32 aid; +AddToEntry(struct ubik_trans *tt, struct prentry *entry, afs_int32 loc, afs_int32 aid) { afs_int32 code; afs_int32 i; @@ -1171,11 +1140,7 @@ AddToEntry(tt, entry, loc, aid) * Note the entry is written out by this routine. */ afs_int32 -AddToSGEntry(tt, entry, loc, aid) - struct ubik_trans *tt; - struct prentry *entry; - afs_int32 loc; - afs_int32 aid; +AddToSGEntry(struct ubik_trans *tt, struct prentry *entry, afs_int32 loc, afs_int32 aid) { register afs_int32 code; afs_int32 i; @@ -1284,10 +1249,7 @@ AddToSGEntry(tt, entry, loc, aid) #endif /* SUPERGROUPS */ afs_int32 -AddToPRList(alist, sizeP, id) - prlist *alist; - int *sizeP; - afs_int32 id; +AddToPRList(prlist *alist, int *sizeP, afs_int32 id) { char *tmp; int count; @@ -1310,11 +1272,7 @@ AddToPRList(alist, sizeP, id) } afs_int32 -GetList(at, tentry, alist, add) - struct ubik_trans *at; - struct prentry *tentry; - prlist *alist; - afs_int32 add; +GetList(struct ubik_trans *at, struct prentry *tentry, prlist *alist, afs_int32 add) { afs_int32 code; afs_int32 i; @@ -1389,12 +1347,7 @@ GetList(at, tentry, alist, add) afs_int32 -GetList2(at, tentry, tentry2, alist, add) - struct ubik_trans *at; - struct prentry *tentry; - struct prentry *tentry2; - prlist *alist; - afs_int32 add; +GetList2(struct ubik_trans *at, struct prentry *tentry, struct prentry *tentry2, prlist *alist, afs_int32 add) { afs_int32 code = 0; afs_int32 i; @@ -1502,12 +1455,7 @@ GetList2(at, tentry, tentry2, alist, add) #if defined(SUPERGROUPS) afs_int32 -GetListSG2(at, gid, alist, sizeP, depth) - struct ubik_trans *at; - afs_int32 gid; - prlist *alist; - afs_int32 depth; - afs_int32 *sizeP; +GetListSG2(struct ubik_trans *at, afs_int32 gid, prlist *alist, afs_int32 *sizeP, afs_int32 depth) { register afs_int32 code; struct prentry tentry; @@ -1623,10 +1571,7 @@ GetListSG2(at, gid, alist, sizeP, depth) } afs_int32 -GetSGList(at, tentry, alist) - struct ubik_trans *at; - struct prentry *tentry; - prlist *alist; +GetSGList(struct ubik_trans *at, struct prentry *tentry, prlist *alist) { register afs_int32 code; afs_int32 i; @@ -1680,10 +1625,7 @@ GetSGList(at, tentry, alist) #endif /* SUPERGROUPS */ afs_int32 -GetOwnedChain(ut, next, alist) - struct ubik_trans *ut; - afs_int32 *next; - prlist *alist; +GetOwnedChain(struct ubik_trans *ut, afs_int32 *next, prlist *alist) { afs_int32 code; struct prentry tentry; @@ -1714,10 +1656,7 @@ GetOwnedChain(ut, next, alist) } afs_int32 -GetMax(at, uid, gid) - struct ubik_trans *at; - afs_int32 *uid; - afs_int32 *gid; +GetMax(struct ubik_trans *at, afs_int32 *uid, afs_int32 *gid) { *uid = ntohl(cheader.maxID); *gid = ntohl(cheader.maxGroup); @@ -1725,10 +1664,7 @@ GetMax(at, uid, gid) } afs_int32 -SetMax(at, id, flag) - struct ubik_trans *at; - afs_int32 id; - afs_int32 flag; +SetMax(struct ubik_trans *at, afs_int32 id, afs_int32 flag) { afs_int32 code; if (flag & PRGRP) { @@ -1750,8 +1686,7 @@ SetMax(at, id, flag) } afs_int32 -read_DbHeader(tt) - struct ubik_trans *tt; +read_DbHeader(struct ubik_trans *tt) { afs_int32 code; @@ -1907,13 +1842,7 @@ Initdb() } afs_int32 -ChangeEntry(at, aid, cid, name, oid, newid) - struct ubik_trans *at; - afs_int32 aid; - afs_int32 cid; - char *name; - afs_int32 oid; - afs_int32 newid; +ChangeEntry(struct ubik_trans *at, afs_int32 aid, afs_int32 cid, char *name, afs_int32 oid, afs_int32 newid) { afs_int32 code; afs_int32 i, nptr, pos; @@ -2246,10 +2175,8 @@ inRange(struct prentry *cellEntry, afs_int32 aid) } -AddAuthGroup(tentry, alist, size) - struct prentry *tentry; - prlist *alist; - afs_int32 *size; +int +AddAuthGroup(struct prentry *tentry, prlist *alist, afs_int32 *size) { if (!(strchr(tentry->name, '@'))) return (AddToPRList(alist, size, AUTHUSERID)); diff --git a/src/ptserver/readgroup.c b/src/ptserver/readgroup.c index 59965ba..5d75c27 100644 --- a/src/ptserver/readgroup.c +++ b/src/ptserver/readgroup.c @@ -36,10 +36,7 @@ int verbose = 0; void skip(); void -report_error(code, name, gname) - afs_int32 code; - char *name; - char *gname; +report_error(afs_int32 code, char *name, char *gname) { if (code == 0) { if (verbose) @@ -65,9 +62,8 @@ osi_audit() #include "AFS_component_version_number.c" -main(argc, argv) - afs_int32 argc; - char **argv; +int +main(int argc, char **argv) { register afs_int32 code; char name[PR_MAXNAMELEN]; @@ -218,8 +214,7 @@ main(argc, argv) } void -skip(s) - char **s; +skip(char **s) { while (**s != ' ' && **s != '\t' && **s != '\0') (*s)++; diff --git a/src/ptserver/readpwd.c b/src/ptserver/readpwd.c index 764a851..165a43e 100644 --- a/src/ptserver/readpwd.c +++ b/src/ptserver/readpwd.c @@ -42,9 +42,8 @@ osi_audit() #include "AFS_component_version_number.c" -main(argc, argv) - afs_int32 argc; - char **argv; +int +main(afs_int32 argc, char **argv) { register afs_int32 code; diff --git a/src/ptserver/testpt.c b/src/ptserver/testpt.c index c94d7d3..951eb37 100644 --- a/src/ptserver/testpt.c +++ b/src/ptserver/testpt.c @@ -55,9 +55,8 @@ static struct afsconf_dir *conf; /* cell info, set by MyBeforeProc */ static char conf_dir[100]; static char lcell[MAXCELLCHARS]; -ListUsedIds(as, arock) - struct cmd_syndesc *as; - char *arock; +int +ListUsedIds(struct cmd_syndesc *as, char *arock) { afs_int32 code; namelist lnames; @@ -184,9 +183,7 @@ afs_int32 *groupOwners; /* ids of owners of groups */ int nUsers, nGroups, nAdds, nRems, nUDels, nGDels; int -IdCmp(a, b) - afs_int32 *a; - afs_int32 *b; +IdCmp(afs_int32 *a, afs_int32 *b) { if (*a > *b) { return 1; @@ -198,16 +195,13 @@ IdCmp(a, b) } static int -sqr(n) - int n; +sqr(int n) { return n * n; } static int -GetGroupLimit(N, x) - int N; - int x; +GetGroupLimit(int N, int x) { int y; double sqrt(); @@ -239,8 +233,7 @@ GetGroupLimit(N, x) } void -CreateUser(u) - int u; +CreateUser(int u) { afs_int32 code; char name[16]; @@ -278,8 +271,7 @@ CreateUser(u) } void -CreateGroup(g) - int g; +CreateGroup(int g) { afs_int32 code; char name[16]; @@ -347,8 +339,7 @@ CreateGroup(g) } int -DeleteRandomId(list) - afs_int32 *list; +DeleteRandomId(afs_int32 *list) { afs_int32 code; afs_int32 id; @@ -376,8 +367,7 @@ DeleteRandomId(list) } void -AddUser(u, g) - int u, g; +AddUser(int u, int g) { afs_int32 code; afs_int32 ui, gi; @@ -400,8 +390,7 @@ AddUser(u, g) } void -RemUser(u, g) - int u, g; +RemUser(int u, int g) { afs_int32 code; afs_int32 ui, gi; @@ -419,9 +408,8 @@ RemUser(u, g) nRems++; } -TestManyMembers(as, arock) - struct cmd_syndesc *as; - char *arock; +int +TestManyMembers(struct cmd_syndesc *as, char *arock) { char *filled; /* users filled up */ char *cleaned; /* users cleaned up */ @@ -736,11 +724,10 @@ TestManyMembers(as, arock) /* Converts a byte string to ascii. Return the number of unconverted bytes. */ static int -ka_ConvertBytes(ascii, alen, bs, bl) - char *ascii; /* output buffer */ - int alen; /* buffer length */ - char bs[]; /* byte string */ - int bl; /* number of bytes */ +ka_ConvertBytes(char *ascii, /* output buffer */ + int alen, /* buffer length */ + char bs[], /* byte string */ + int bl) /* number of bytes */ { int i; unsigned char c; @@ -778,9 +765,8 @@ ka_ConvertBytes(ascii, alen, bs, bl) * must be correct. */ -TestPrServ(as, arock) - struct cmd_syndesc *as; - char *arock; +int +TestPrServ(struct cmd_syndesc *as, char *arock) { afs_int32 id; char name[PR_MAXNAMELEN + 1]; @@ -926,9 +912,7 @@ static char tmp_cell_file[128] = ""; static char tmp_noauth_file[128] = ""; static int -MyAfterProc(as, arock) - struct cmd_syndesc *as; - char *arock; +MyAfterProc(struct cmd_syndesc *as, char *arock) { if (strlen(tmp_conf_file)) unlink(tmp_conf_file); @@ -942,9 +926,7 @@ MyAfterProc(as, arock) } static int -MyBeforeProc(as, arock) - struct cmd_syndesc *as; - char *arock; +MyBeforeProc(struct cmd_syndesc *as, char *arock) { afs_int32 code; int i; @@ -1079,8 +1061,7 @@ MyBeforeProc(as, arock) } static void -add_std_args(ts) - register struct cmd_syndesc *ts; +add_std_args(register struct cmd_syndesc *ts) { cmd_Seek(ts, 12); cmd_AddParm(ts, "-confdir", CMD_SINGLE, CMD_OPTIONAL, @@ -1102,9 +1083,8 @@ osi_audit() #include "AFS_component_version_number.c" -main(argc, argv) - int argc; - char *argv[]; +int +main(int argc, char *argv[]) { afs_int32 code; struct cmd_syndesc *ts; /* ptr to parsed command line syntax */ diff --git a/src/ptserver/utils.c b/src/ptserver/utils.c index 7877d2e..5040737 100644 --- a/src/ptserver/utils.c +++ b/src/ptserver/utils.c @@ -40,16 +40,14 @@ afs_int32 IsAMemberOfSG(struct ubik_trans *at, afs_int32 aid, afs_int32 gid, #endif afs_int32 -IDHash(x) - afs_int32 x; +IDHash(afs_int32 x) { /* returns hash bucket for x */ return ((abs(x)) % HASHSIZE); } afs_int32 -NameHash(aname) - register unsigned char *aname; +NameHash(register unsigned char *aname) { /* returns hash bucket for aname */ register unsigned int hash = 0; @@ -62,12 +60,7 @@ NameHash(aname) afs_int32 -pr_Write(tt, afd, pos, buff, len) - struct ubik_trans *tt; - afs_int32 afd; - afs_int32 pos; - char *buff; - afs_int32 len; +pr_Write(struct ubik_trans *tt, afs_int32 afd, afs_int32 pos, char *buff, afs_int32 len) { /* package up seek and write into one procedure for ease of use */ afs_int32 code; @@ -84,12 +77,7 @@ pr_Write(tt, afd, pos, buff, len) } afs_int32 -pr_Read(tt, afd, pos, buff, len) - struct ubik_trans *tt; - afs_int32 afd; - afs_int32 pos; - char *buff; - afs_int32 len; +pr_Read(struct ubik_trans *tt, afs_int32 afd, afs_int32 pos, char *buff, afs_int32 len) { /* same thing for read */ afs_int32 code; @@ -100,11 +88,8 @@ pr_Read(tt, afd, pos, buff, len) return code; } -pr_WriteEntry(tt, afd, pos, tentry) - struct ubik_trans *tt; - afs_int32 afd; - afs_int32 pos; - struct prentry *tentry; +int +pr_WriteEntry(struct ubik_trans *tt, afs_int32 afd, afs_int32 pos, struct prentry *tentry) { afs_int32 code; register afs_int32 i; @@ -144,11 +129,8 @@ pr_WriteEntry(tt, afd, pos, tentry) return (code); } -pr_ReadEntry(tt, afd, pos, tentry) - struct ubik_trans *tt; - afs_int32 afd; - afs_int32 pos; - struct prentry *tentry; +int +pr_ReadEntry(struct ubik_trans *tt, afs_int32 afd, afs_int32 pos, struct prentry *tentry) { afs_int32 code; register afs_int32 i; @@ -193,11 +175,8 @@ pr_ReadEntry(tt, afd, pos, tentry) return (code); } -pr_WriteCoEntry(tt, afd, pos, tentry) - struct ubik_trans *tt; - afs_int32 afd; - afs_int32 pos; - struct contentry *tentry; +int +pr_WriteCoEntry(struct ubik_trans *tt, afs_int32 afd, afs_int32 pos, struct contentry *tentry) { afs_int32 code; register afs_int32 i; @@ -217,11 +196,8 @@ pr_WriteCoEntry(tt, afd, pos, tentry) return (code); } -pr_ReadCoEntry(tt, afd, pos, tentry) - struct ubik_trans *tt; - afs_int32 afd; - afs_int32 pos; - struct contentry *tentry; +int +pr_ReadCoEntry(struct ubik_trans *tt, afs_int32 afd, afs_int32 pos, struct contentry *tentry) { afs_int32 code; register afs_int32 i; @@ -250,8 +226,7 @@ pr_ReadCoEntry(tt, afd, pos, tentry) * new entry */ afs_int32 -AllocBlock(at) - register struct ubik_trans *at; +AllocBlock(register struct ubik_trans *at) { register afs_int32 code; afs_int32 temp; @@ -284,9 +259,7 @@ AllocBlock(at) } afs_int32 -FreeBlock(at, pos) - register struct ubik_trans *at; - afs_int32 pos; +FreeBlock(register struct ubik_trans *at, afs_int32 pos) { /* add a block of storage to the free list */ register afs_int32 code; @@ -307,9 +280,7 @@ FreeBlock(at, pos) } afs_int32 -FindByID(at, aid) - register struct ubik_trans *at; - afs_int32 aid; +FindByID(register struct ubik_trans *at, afs_int32 aid) { /* returns address of entry if found, 0 otherwise */ register afs_int32 code; @@ -342,13 +313,8 @@ FindByID(at, aid) return 0; } - - afs_int32 -FindByName(at, aname, tentryp) - register struct ubik_trans *at; - char aname[PR_MAXNAMELEN]; - struct prentry *tentryp; +FindByName(register struct ubik_trans *at, char aname[PR_MAXNAMELEN], struct prentry *tentryp) { /* ditto */ register afs_int32 code; @@ -379,10 +345,7 @@ FindByName(at, aname, tentryp) } afs_int32 -AllocID(at, flag, aid) - register struct ubik_trans *at; - afs_int32 flag; - afs_int32 *aid; +AllocID(register struct ubik_trans *at, afs_int32 flag, afs_int32 *aid) { /* allocs an id from the proper area of address space, based on flag */ register afs_int32 code = 1; @@ -441,10 +404,7 @@ AllocID(at, flag, aid) } afs_int32 -IDToName(at, aid, aname) - register struct ubik_trans *at; - afs_int32 aid; - char aname[PR_MAXNAMELEN]; +IDToName(register struct ubik_trans *at, afs_int32 aid, char aname[PR_MAXNAMELEN]) { afs_int32 temp; struct prentry tentry; @@ -461,10 +421,7 @@ IDToName(at, aid, aname) } afs_int32 -NameToID(at, aname, aid) - register struct ubik_trans *at; - char aname[PR_MAXNAMELEN]; - afs_int32 *aid; +NameToID(register struct ubik_trans *at, char aname[PR_MAXNAMELEN], afs_int32 *aid) { afs_int32 temp; struct prentry tentry; @@ -477,9 +434,7 @@ NameToID(at, aname, aid) } int -IDCmp(a, b) - afs_int32 *a; - afs_int32 *b; +IDCmp(afs_int32 *a, afs_int32 *b) { /* used to sort CPS's so that comparison with acl's is easier */ if (*a > *b) { @@ -492,10 +447,7 @@ IDCmp(a, b) } afs_int32 -RemoveFromIDHash(tt, aid, loc) - struct ubik_trans *tt; - afs_int32 aid; - afs_int32 *loc; /* ??? in case ID hashed twice ??? */ +RemoveFromIDHash(struct ubik_trans *tt, afs_int32 aid, afs_int32 *loc) /* ??? in case ID hashed twice ??? */ { /* remove entry designated by aid from id hash table */ register afs_int32 code; @@ -546,10 +498,7 @@ RemoveFromIDHash(tt, aid, loc) } afs_int32 -AddToIDHash(tt, aid, loc) - struct ubik_trans *tt; - afs_int32 aid; - afs_int32 loc; /* ??? */ +AddToIDHash(struct ubik_trans *tt, afs_int32 aid, afs_int32 loc) { /* add entry at loc designated by aid to id hash table */ register afs_int32 code; @@ -577,10 +526,7 @@ AddToIDHash(tt, aid, loc) } afs_int32 -RemoveFromNameHash(tt, aname, loc) - struct ubik_trans *tt; - char *aname; - afs_int32 *loc; +RemoveFromNameHash(struct ubik_trans *tt, char *aname, afs_int32 *loc) { /* remove from name hash */ register afs_int32 code; @@ -629,10 +575,7 @@ RemoveFromNameHash(tt, aname, loc) } afs_int32 -AddToNameHash(tt, aname, loc) - struct ubik_trans *tt; - char *aname; - afs_int32 loc; +AddToNameHash(struct ubik_trans *tt, char *aname, afs_int32 loc) { /* add to name hash */ register afs_int32 code; @@ -658,10 +601,7 @@ AddToNameHash(tt, aname, loc) } afs_int32 -AddToOwnerChain(at, gid, oid) - struct ubik_trans *at; - afs_int32 gid; - afs_int32 oid; +AddToOwnerChain(struct ubik_trans *at, afs_int32 gid, afs_int32 oid) { /* add entry designated by gid to owner chain of entry designated by oid */ register afs_int32 code; @@ -699,10 +639,7 @@ AddToOwnerChain(at, gid, oid) /* RemoveFromOwnerChain - remove gid from owner chain for oid */ afs_int32 -RemoveFromOwnerChain(at, gid, oid) - struct ubik_trans *at; - afs_int32 gid; - afs_int32 oid; +RemoveFromOwnerChain(struct ubik_trans *at, afs_int32 gid, afs_int32 oid) { register afs_int32 code; afs_int32 nptr; @@ -761,9 +698,7 @@ RemoveFromOwnerChain(at, gid, oid) /* AddToOrphan - add gid to orphan list, as it's owner has died */ afs_int32 -AddToOrphan(at, gid) - struct ubik_trans *at; - afs_int32 gid; +AddToOrphan(struct ubik_trans *at, afs_int32 gid) { register afs_int32 code; afs_int32 loc; @@ -787,9 +722,7 @@ AddToOrphan(at, gid) } afs_int32 -RemoveFromOrphan(at, gid) - struct ubik_trans *at; - afs_int32 gid; +RemoveFromOrphan(struct ubik_trans *at, afs_int32 gid) { /* remove gid from the orphan list */ register afs_int32 code; @@ -844,10 +777,7 @@ RemoveFromOrphan(at, gid) } afs_int32 -IsOwnerOf(at, aid, gid) - struct ubik_trans *at; - afs_int32 aid; - afs_int32 gid; +IsOwnerOf(struct ubik_trans *at, afs_int32 aid, afs_int32 gid) { /* returns 1 if aid is the owner of gid, 0 otherwise */ register afs_int32 code; @@ -866,9 +796,7 @@ IsOwnerOf(at, aid, gid) } afs_int32 -OwnerOf(at, gid) - struct ubik_trans *at; - afs_int32 gid; +OwnerOf(struct ubik_trans *at, afs_int32 gid) { /* returns the owner of gid */ register afs_int32 code; @@ -886,10 +814,7 @@ OwnerOf(at, gid) afs_int32 -IsAMemberOf(at, aid, gid) - struct ubik_trans *at; - afs_int32 aid; - afs_int32 gid; +IsAMemberOf(struct ubik_trans *at, afs_int32 aid, afs_int32 gid) { /* returns true if aid is a member of gid */ #if !defined(SUPERGROUPS) @@ -947,13 +872,8 @@ IsAMemberOf(at, aid, gid) #if defined(SUPERGROUPS) - afs_int32 -IsAMemberOfSG(at, aid, gid, depth) - struct ubik_trans *at; - afs_int32 aid; - afs_int32 gid; - afs_int32 depth; +IsAMemberOfSG(struct ubik_trans *at, afs_int32 aid, afs_int32 gid, afs_int32 depth) { /* returns true if aid is a member of gid */ struct prentry tentry; @@ -1017,5 +937,4 @@ IsAMemberOfSG(at, aid, gid, depth) } return 0; /* actually, should never get here */ } - #endif /* SUPERGROUPS */ diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c index 590601c..640d266 100644 --- a/src/rxkad/rxkad_common.c +++ b/src/rxkad/rxkad_common.c @@ -526,3 +526,27 @@ rxkad_GetStats(struct rx_securityClass *aobj, struct rx_connection *aconn, } return 0; } + +rxkad_level +rxkad_StringToLevel(char *name) +{ + if (strcmp(name, "clear") == 0) + return rxkad_clear; + if (strcmp(name, "auth") == 0) + return rxkad_auth; + if (strcmp(name, "crypt") == 0) + return rxkad_crypt; + return -1; +} + +char * +rxkad_LevelToString(rxkad_level level) +{ + if (level == rxkad_clear) + return "clear"; + if (level == rxkad_auth) + return "auth"; + if (level == rxkad_crypt) + return "crypt"; + return "unknown"; +} diff --git a/src/rxkad/rxkad_prototypes.h b/src/rxkad/rxkad_prototypes.h index 3dc8930..c689ea2 100644 --- a/src/rxkad/rxkad_prototypes.h +++ b/src/rxkad/rxkad_prototypes.h @@ -76,6 +76,8 @@ extern int rxkad_PreparePacket(struct rx_securityClass *aobj, extern int rxkad_GetStats(struct rx_securityClass *aobj, struct rx_connection *aconn, struct rx_securityObjectStats *astats); +extern rxkad_level rxkad_StringToLevel(char *string); +extern char *rxkad_LevelToString(rxkad_level level); /* rxkad_errs.c */ diff --git a/src/update/client.c b/src/update/client.c index 40ef9cc..9a5cdd4 100644 --- a/src/update/client.c +++ b/src/update/client.c @@ -55,6 +55,9 @@ RCSID #include #include #include +#ifdef AFS_AIX_ENV +#include +#endif #include "update.h" #include "global.h" @@ -69,8 +72,7 @@ static int RenameNewFiles(struct filestr *modFiles); static int PathsAreEquivalent(char *path1, char *path2); afs_int32 -GetServer(aname) - char *aname; +GetServer(char *aname) { register struct hostent *th; afs_int32 addr; @@ -98,9 +100,7 @@ osi_audit() #endif int -main(argc, argv) - int argc; - char **argv; +main(int argc, char **argv) { struct rx_connection *conn; struct rx_call *call; @@ -405,10 +405,9 @@ main(argc, argv) } /* returns 1 if the file is upto date else returns 0*/ +/*check the dir case more carefully */ int -IsCompatible(filename, time, length) /*check the dir case more carefully */ - char *filename; - afs_int32 time, length; +IsCompatible(char *filename, afs_int32 time, afs_int32 length) { struct stat status; afs_int32 error; @@ -425,7 +424,7 @@ IsCompatible(filename, time, length) /*check the dir case more carefully */ free(localname); if (error == -1) - return 0; /*a non-existent file, has to be fetched fresh */ + return 0; /*a non-existent file, has to be fetched fresh */ if ((status.st_mode & S_IFMT) == S_IFDIR || ((status.st_mtime == time) && (status.st_size == length))) return (1); @@ -434,10 +433,7 @@ IsCompatible(filename, time, length) /*check the dir case more carefully */ } int -FetchFile(call, remoteFile, localFile, dirFlag) - struct rx_call *call; - char *localFile, *remoteFile; - int dirFlag; +FetchFile(struct rx_call *call, char *remoteFile, char *localFile, int dirFlag) { int fd = -1, error = 0; struct stat status; @@ -473,33 +469,20 @@ FetchFile(call, remoteFile, localFile, dirFlag) int -update_ReceiveFile(fd, call, status) - register int fd; - register struct rx_call *call; - register struct stat *status; +update_ReceiveFile(register int fd, register struct rx_call *call, register struct stat *status) { register char *buffer = (char *)0; afs_int32 length; -#ifdef notdef - XDR xdr; -#endif register int blockSize; afs_int32 error = 0, len; #ifdef AFS_AIX_ENV -#include struct statfs tstatfs; #endif -#ifdef notdef - xdrrx_create(&xdr, call, XDR_DECODE); - if (!xdr_afs_int32(&xdr, &length)) - return UPDATE_ERROR; -#else len = rx_Read(call, &length, sizeof(afs_int32)); length = ntohl(length); if (len != sizeof(afs_int32)) return UPDATE_ERROR; -#endif #ifdef AFS_AIX_ENV /* Unfortunately in AIX valuable fields such as st_blksize are gone from the stat structure!! */ fstatfs(fd, &tstatfs); @@ -585,9 +568,7 @@ PathsAreEquivalent(char *path1, char *path2) * deleted on client site) else it returns 0 */ int -NotOnHost(filename, okhostfiles) - char *filename; - struct filestr *okhostfiles; +NotOnHost(char *filename, struct filestr *okhostfiles) { int i, rc; struct stat status; @@ -663,8 +644,7 @@ RenameNewFiles(struct filestr *modFiles) * and the uid, gid, file mode, access and modification times will be set to * the passed in values. */ -static - int +static int GetFileFromUpServer(struct rx_connection *conn, /* handle for upserver */ char *filename, /* name of file to be fetched */ short uid, short gid, /* uid/gid for fetched file */ diff --git a/src/update/server.c b/src/update/server.c index 16fcf37..54b1917 100644 --- a/src/update/server.c +++ b/src/update/server.c @@ -50,11 +50,13 @@ RCSID #include #include #include +#ifdef AFS_AIX_ENV +#include +#endif #include "update.h" #include "global.h" extern int UPDATE_ExecuteRequest(); -extern rxkad_level StringToLevel(char *name); static int AddObject(char **expPath, char *dir); static int PathInDirectory(char *dir, char *path); @@ -69,8 +71,7 @@ static int Quit(); /* check whether caller is authorized to manage RX statistics */ int -update_rxstat_userok(call) - struct rx_call *call; +update_rxstat_userok(struct rx_call *call) { return afsconf_SuperUser(cdir, call, NULL); } @@ -131,11 +132,8 @@ PathInDirectory(char *dir, char *path) return inDir; } - int -AuthOkay(call, name) - struct rx_call *call; - char *name; +AuthOkay(struct rx_call *call, char *name) { int i; rxkad_level level; @@ -181,9 +179,7 @@ osi_audit() #endif int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { struct rx_securityClass *securityObjects[3]; struct rx_service *service; @@ -240,7 +236,7 @@ main(argc, argv) if (argv[a][0] == '-') { /* parse options */ char arg[256]; lcstring(arg, argv[a], sizeof(arg)); - newLevel = StringToLevel(&argv[a][1]); + newLevel = rxkad_StringToLevel(&argv[a][1]); if (newLevel != -1) { level = newLevel; /* set new level */ continue; @@ -317,9 +313,7 @@ main(argc, argv) /* fetch the file name and send it to the remote requester specified by call */ int -UPDATE_FetchFile(call, name) - struct rx_call *call; - char *name; +UPDATE_FetchFile(struct rx_call *call, char *name) { int fd = -1; int error = 0; @@ -352,9 +346,7 @@ UPDATE_FetchFile(call, name) /* fetch dir info about directory name and send it to remote host associated with call. */ int -UPDATE_FetchInfo(call, name) - struct rx_call *call; - char *name; +UPDATE_FetchInfo(struct rx_call *call, char *name) { int error = 0; struct stat status; @@ -395,19 +387,12 @@ Quit(msg, a, b) } int -update_SendFile(fd, call, status) - register int fd; - register struct rx_call *call; - register struct stat *status; +update_SendFile(register int fd, register struct rx_call *call, register struct stat *status) { char *buffer = (char *)0; int blockSize; afs_int32 length, tlen; -#ifdef notdef - XDR xdr; -#endif #ifdef AFS_AIX_ENV -#include struct statfs tstatfs; #endif @@ -427,14 +412,8 @@ update_SendFile(fd, call, status) printf("malloc failed\n"); return UPDATE_ERROR; } -#ifdef notdef - xdrrx_create(&xdr, call, XDR_ENCODE); - if (!xdr_afs_int32(&xdr, &length)) - error = UPDATE_ERROR; -#else tlen = htonl(length); rx_Write(call, &tlen, sizeof(afs_int32)); /* send length on fetch */ -#endif while (!error && length) { register int nbytes = (length > blockSize ? blockSize : length); nbytes = read(fd, buffer, nbytes); @@ -456,11 +435,10 @@ update_SendFile(fd, call, status) /* Enumerate dir (name) and write dir entry info into temp file. */ int -update_SendDirInfo(name, call, status, origDir) - char *name; /* Name of dir to enumerate */ - register struct rx_call *call; /* rx call */ - register struct stat *status; /* stat struct for dir */ - char *origDir; /* orig name of dir before being localized */ +update_SendDirInfo(char *name, /* Name of dir to enumerate */ + register struct rx_call *call, /* rx call */ + register struct stat *status, /* stat struct for dir */ + char *origDir) /* orig name of dir before being localized */ { DIR *dirp; struct dirent *dp; diff --git a/src/update/utils.c b/src/update/utils.c index 5b97e13..13d6b86 100644 --- a/src/update/utils.c +++ b/src/update/utils.c @@ -35,9 +35,7 @@ RCSID #include int -AddToList(ah, aname) - struct filestr **ah; - char *aname; +AddToList(struct filestr **ah, char *aname) { register struct filestr *tf; tf = (struct filestr *)malloc(sizeof(struct filestr)); @@ -49,8 +47,7 @@ AddToList(ah, aname) } int -ZapList(ah) - struct filestr **ah; +ZapList(struct filestr **ah) { register struct filestr *tf, *nf; for (tf = *ah; tf; tf = nf) { @@ -61,19 +58,3 @@ ZapList(ah) *ah = NULL; return 0; } - -/* StringToLevel - converts the name of an rxkad security level to a integer - * suitable for calling rxkad_New*SecurityObject. */ - -rxkad_level -StringToLevel(name) - char *name; -{ - if (strcmp(name, "clear") == 0) - return rxkad_clear; - if (strcmp(name, "auth") == 0) - return rxkad_auth; - if (strcmp(name, "crypt") == 0) - return rxkad_crypt; - return -1; -} diff --git a/src/vol/vnode.c b/src/vol/vnode.c index 7a2fbc2..6435788 100644 --- a/src/vol/vnode.c +++ b/src/vol/vnode.c @@ -103,6 +103,7 @@ void StickOnLruChain_r(register Vnode * vnp, #define THELOGSIZE 5120 static afs_int32 theLog[THELOGSIZE]; static afs_int32 vnLogPtr = 0; +void VNLog(aop, anparms, av1, av2, av3, av4) afs_int32 aop, anparms; afs_int32 av1, av2, av3, av4; diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c index c2029e4..727ba21 100644 --- a/src/vol/vol-info.c +++ b/src/vol/vol-info.c @@ -613,7 +613,7 @@ HandleVolume(struct DiskPartition *dp, char *name) } } - +int main(int argc, char **argv) { register struct cmd_syndesc *ts; -- 1.9.4