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>

diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c
index b9e6d55c2c9ea94f4bbc7a5a8f96fb05baceb060..0ba1fde3207af608c1e05786f162886437feb797 100644 (file)
--- 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 02541e34166caede406f14a46ed890e56f010de6..420c4b63192429e7896ec85046efdb58130b6a35 100644 (file)
--- 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 cd93d50c8e43df7b7aa0d2d7d7a911e110db6db5..3038cc0cb116b3068c76d677be5384480ff778de 100644 (file)
--- 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 0b96185e29526ac2a2f2d409266b91fc77a24191..10900499859b7a06e73f5fb70f2f079decfeebf5 100644 (file)
--- 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)