From 6ae0c53d93f26ddadc37dbf268652b1f8af8b3ec Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Tue, 28 Jul 2009 11:09:30 +0100
Subject: [PATCH] Code cleanup for vlserver

Move the cnvldb.h include so it's after vlserver.h
Don't define MAXSERVERS in cnvldb.h (it's already defined elsewhere)
Cast nvldbentry(s) to vldbentry to avoid warnings from display_entry
Volume IDs are unsigned
Use var[0]='\0' rather than sprintf(var, "");

Reviewed-on: http://gerrit.openafs.org/237
Tested-by: Marc Dionne <marc.c.dionne@gmail.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 src/vlserver/cnvldb.c     | 2 +-
 src/vlserver/cnvldb.h     | 1 -
 src/vlserver/vlclient.c   | 6 +++---
 src/vlserver/vldb_check.c | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c
index b9e6d55c2..0ba1fde32 100644
--- a/src/vlserver/cnvldb.c
+++ b/src/vlserver/cnvldb.c
@@ -18,7 +18,6 @@
 #include <sys/file.h>
 #include <string.h>
 
-#include "cnvldb.h"		/* CHANGEME! */
 #include <netinet/in.h>
 #include <afs/venus.h>
 #include <afs/cmd.h>
@@ -26,6 +25,7 @@
 #include <afs/fileutil.h>
 
 #include "vlserver.h"
+#include "cnvldb.h"		/* CHANGEME! */
 
 #define MAXSIZE 2048		/* most I'll get back from PIOCTL */
 #define	BADSERVERID	255	/* XXX */
diff --git a/src/vlserver/cnvldb.h b/src/vlserver/cnvldb.h
index 02541e341..420c4b631 100644
--- a/src/vlserver/cnvldb.h
+++ b/src/vlserver/cnvldb.h
@@ -96,7 +96,6 @@ struct vlentry_3 {
     afs_int32 nextIdHash[3];
     afs_int32 nextNameHash;
     char name[65];
-#define MAXSERVERS	13
     unsigned char serverNumber[MAXSERVERS];
     unsigned char serverPartition[MAXSERVERS];
     unsigned char serverFlags[MAXSERVERS];
diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c
index cd93d50c8..3038cc0cb 100644
--- a/src/vlserver/vlclient.c
+++ b/src/vlserver/vlclient.c
@@ -636,7 +636,7 @@ handleit(struct cmd_syndesc *as, void *arock)
 		       (netries == 1 ? "y" : "ies"));
 		for (vllist = linkedvldbs.node; vllist; vllist = vllist1) {
 		    vllist1 = vllist->next_vldb;
-		    display_entry(&vllist->VldbEntry, 0);
+		    display_entry((struct vldbentry *)&vllist->VldbEntry, 0);
 		    free((char *)vllist);
 		}
 	    } else if (!strcmp(oper, "di")) {
@@ -724,12 +724,12 @@ handleit(struct cmd_syndesc *as, void *arock)
 		display_entry(&entry, code);
 		printf("return code is %d.\n", code);
 	    } else if (!strcmp(oper, "nv")) {
-		int newvolid;
+		unsigned int newvolid;
 		sscanf(&(*argp)[0], "%d", &id);
 		code =
 		    ubik_VL_GetNewVolumeId(cstruct, 0, id, &newvolid);
 		if (!code)
-		    printf("Current Max volid is (in hex):%X\n", newvolid);
+		    printf("Current Max volid is (in hex):0x%x\n", newvolid);
 		printf("return code is %d\n", code);
 	    } else if (!strcmp(oper, "gs")) {
 		vldstats stats;
diff --git a/src/vlserver/vldb_check.c b/src/vlserver/vldb_check.c
index 0b96185e2..109004998 100644
--- a/src/vlserver/vldb_check.c
+++ b/src/vlserver/vldb_check.c
@@ -1178,7 +1178,7 @@ WorkerBee(struct cmd_syndesc *as, void *arock)
 		hash = NameHash(vlentry.name);
 		nextpp = &vlentry.nextNameHash;
 		which = "name";
-		sprintf(volidbuf, "");
+		volidbuf[0]='\0';
 		foundbad = 1;
 	    }
 
@@ -1218,7 +1218,7 @@ WorkerBee(struct cmd_syndesc *as, void *arock)
 		hash = NameHash(vlentry.name);
 		nextpp = &vlentry.nextNameHash;
 		which = "name";
-		sprintf(volidbuf, "");
+		volidbuf[0]='\0';
 		readentry(nextp, &vlentry2, &type);
 		nexthash = NameHash(vlentry2.name);
 		if (hash != nexthash)
-- 
2.39.5