From 420dfad900267720d1665a67c92c567a341728c7 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Wed, 11 Nov 2009 10:28:29 +0000 Subject: [PATCH] const char paths for ubik_ServerInit ubik_ServerInit* take a pathname, which should really be a const. It already is in many of the callers, some of which remove the const by casting, the others throw errors. Make pathName const for all of ubik_ServerInitByInfo, ubik_ServerInit and ubik_ServerInitCommon. Update all of our callers to remove the now unecessary casting. Remove the now uneccessary warning inhibition on vlserver/vlserver.c Change-Id: I009103dc49e4473eec65ebd75aab727915c26f3c Reviewed-on: http://gerrit.openafs.org/811 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- README.WARNINGS | 1 - src/kauth/kaserver.c | 4 ++-- src/ptserver/ptserver.c | 2 +- src/ptserver/ubik.c | 2 +- src/ubik/ubik.c | 6 +++--- src/ubik/ubik.p.h | 5 +++-- src/vlserver/Makefile.in | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.WARNINGS b/README.WARNINGS index c151e49..409bdd9 100644 --- a/README.WARNINGS +++ b/README.WARNINGS @@ -80,7 +80,6 @@ uss/uss_vol.c : all Format issues uss/uss_kauth.c : all : Des keys, ubik_Call uss/lex.yy.c : all : Unused symbols viced/fsprobe.c : all : ubik_Call -vlserver/vlserver.c : all : GetExtendedCellInfo vol/salvager.c : all : consts & undefined variable from header volser/vos.c : all : ubik_Call_New volser/vol-dump.c : format : afs_sfsize_t diff --git a/src/kauth/kaserver.c b/src/kauth/kaserver.c index cab9a76..8b0c80a 100644 --- a/src/kauth/kaserver.c +++ b/src/kauth/kaserver.c @@ -385,11 +385,11 @@ main(int argc, char *argv[]) if (servers) code = ubik_ServerInit(myHost, htons(AFSCONF_KAUTHPORT), serverList, - (char *)dbpath, &KA_dbase); + dbpath, &KA_dbase); else code = ubik_ServerInitByInfo(myHost, htons(AFSCONF_KAUTHPORT), &cellinfo, - clones, (char *)dbpath, &KA_dbase); + clones, dbpath, &KA_dbase); if (code) { afs_com_err(whoami, code, "Ubik init failed"); diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index 2c958a9..803a0d2 100644 --- a/src/ptserver/ptserver.c +++ b/src/ptserver/ptserver.c @@ -522,7 +522,7 @@ main(int argc, char **argv) code = ubik_ServerInitByInfo(myHost, htons(AFSCONF_PROTPORT), &info, clones, - (char *)pr_dbaseName, &dbase); + pr_dbaseName, &dbase); if (code) { afs_com_err(whoami, code, "Ubik init failed"); PT_EXIT(2); diff --git a/src/ptserver/ubik.c b/src/ptserver/ubik.c index 4cec9f6..b5cdf61 100644 --- a/src/ptserver/ubik.c +++ b/src/ptserver/ubik.c @@ -27,7 +27,7 @@ struct ubik_dbase *dbase; int ubik_ServerInit(afs_int32 myHost, short myPort, afs_int32 serverList[], - char *pathName, struct ubik_dbase **dbase) + const char *pathName, struct ubik_dbase **dbase) { return (0); } diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c index 09374f8..f72032f 100644 --- a/src/ubik/ubik.c +++ b/src/ubik/ubik.c @@ -385,7 +385,7 @@ ContactQuorum_DISK_SetVersion(register struct ubik_trans *atrans, int aflags, int ubik_ServerInitCommon(afs_int32 myHost, short myPort, struct afsconf_cell *info, char clones[], - afs_int32 serverList[], char *pathName, + afs_int32 serverList[], const char *pathName, struct ubik_dbase **dbase) { register struct ubik_dbase *tdb; @@ -560,7 +560,7 @@ ubik_ServerInitCommon(afs_int32 myHost, short myPort, int ubik_ServerInitByInfo(afs_int32 myHost, short myPort, struct afsconf_cell *info, char clones[], - char *pathName, struct ubik_dbase **dbase) + const char *pathName, struct ubik_dbase **dbase) { afs_int32 code; @@ -575,7 +575,7 @@ ubik_ServerInitByInfo(afs_int32 myHost, short myPort, */ int ubik_ServerInit(afs_int32 myHost, short myPort, afs_int32 serverList[], - char *pathName, struct ubik_dbase **dbase) + const char *pathName, struct ubik_dbase **dbase) { afs_int32 code; diff --git a/src/ubik/ubik.p.h b/src/ubik/ubik.p.h index 32d5ebe..315a80f 100644 --- a/src/ubik/ubik.p.h +++ b/src/ubik/ubik.p.h @@ -455,10 +455,11 @@ extern afs_int32 ubik_nBuffers; struct afsconf_cell; extern int ubik_ServerInitByInfo(afs_int32 myHost, short myPort, struct afsconf_cell *info, char clones[], - char *pathName, struct ubik_dbase **dbase); + const char *pathName, + struct ubik_dbase **dbase); extern int ubik_ServerInit(afs_int32 myHost, short myPort, afs_int32 serverList[], - char *pathName, struct ubik_dbase **dbase); + const char *pathName, struct ubik_dbase **dbase); extern int ubik_BeginTrans(register struct ubik_dbase *dbase, afs_int32 transMode, struct ubik_trans **transPtr); extern int ubik_BeginTransReadAny(register struct ubik_dbase *dbase, diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in index b4c5d70..8f4b189 100644 --- a/src/vlserver/Makefile.in +++ b/src/vlserver/Makefile.in @@ -127,7 +127,7 @@ vlserver.h vl_errors.c: vl_errors.et vlserver.p.h $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${srcdir} vl_errors -h vlserver vlserver.o: vlserver.c - $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $< + system: install install: vlserver cnvldb vldb_check libvldb.a vl_opcodes.h vlserver.h \ -- 1.9.4