vlserver: Use unsigned addresses

[openafs.git] / src / vlserver / cnvldb.c

diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c
index b9e6d55..80f263a 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,8 +25,8 @@
 #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 */
 
 
@@ -35,7 +34,7 @@ static char pn[] = "cnvldb";
 static char tempname[] = "XXnewvldb";
 static int MaxServers[3] = { 30, 254, 254 };   /* max server # permitted in this version */
 
-static afs_int32 Conv4to3(afs_int32 addr);
+static afs_int32 Conv4to3(afs_uint32 addr);
 
 static void convert_vlentry(int, int, int, struct vlheader_1 *,
                            struct vlheader_1 *, struct vlentry_1 *);
@@ -110,7 +109,7 @@ handleit(struct cmd_syndesc *as, void *arock)
     read(old, &fromv, sizeof(int));
     fromv = ntohl(fromv);
     if ((fromv < 1) || (fromv > 4)) {
-       fprintf(stderr, pn);
+       fprintf(stderr, "%s", pn);
        fprintf(stderr, ": Unrecognized VLDB version %d.\n", fromv);
        exit(-1);
     }
@@ -167,9 +166,9 @@ handleit(struct cmd_syndesc *as, void *arock)
     }
 
     if ((fromvers < 1) || (fromvers > 4)) {
-       fprintf(stderr, pn);
+       fprintf(stderr, "%s", pn);
        fprintf(stderr, ": VLDB version %d is not supported.\n", fromvers);
-       fprintf(stderr, pn);
+       fprintf(stderr, "%s", pn);
        fprintf(stderr, ": Only versions 1-4 are currently supported.\n");
        exit(-1);
     }
@@ -178,15 +177,15 @@ handleit(struct cmd_syndesc *as, void *arock)
        tovers = fromvers + 1;
 
     if (tovers < 1 || tovers > 4) {
-       fprintf(stderr, pn);
+       fprintf(stderr, "%s", pn);
        fprintf(stderr, ": VLDB version %d is not supported.\n", tovers);
-       fprintf(stderr, pn);
+       fprintf(stderr, "%s", pn);
        fprintf(stderr, ": Only versions 1 - 4 are currently supported.\n");
        exit(-1);
     }
 
     if (mhaddr && (tovers < 3)) {
-       fprintf(stderr, pn);
+       fprintf(stderr, "%s", pn);
        fprintf(stderr, ": Cannot convert. VLDB contains multihome info.\n");
        exit(-1);
     }
@@ -334,7 +333,7 @@ printentry(int version, void *addr)
 
        if (vl3p->flags == VLFREE)
            return;
-       printf("%s\tPos=%lu NextIdHash=[%d:%d:%d] NextNameHash=%d\n",
+       printf("%s\tPos=%" AFS_SIZET_FMT " NextIdHash=[%d:%d:%d] NextNameHash=%d\n",
               vl3p->name, (oldpos - sizeof(struct vlentry_3)),
               vl3p->nextIdHash[0], vl3p->nextIdHash[1], vl3p->nextIdHash[2],
               vl3p->nextNameHash);
@@ -743,9 +742,9 @@ convert_header(int ofd, int fd, int fromv, int tov, void *fromaddr,
  * Before this can be called, the routine read_mhentries must be called.
  */
 static afs_int32
-Conv4to3(afs_int32 addr)
+Conv4to3(afs_uint32 addr)
 {
-    afs_int32 raddr;
+    afs_uint32 raddr;
     int i;
 
     if (!base[0] || !addr)
@@ -824,7 +823,7 @@ convert_vlentry(int new, int fromvers, int tovers,
        struct vlentry_2 vl;
        struct vlentry_3 *xnvlentry = (struct vlentry_3 *)vlentryp;
 
-       memset((char *)&vl, 0, sizeof(struct vlentry_2));
+       memset(&vl, 0, sizeof(struct vlentry_2));
        vl.volumeId[0] = xnvlentry->volumeId[0];
        vl.volumeId[1] = xnvlentry->volumeId[1];
        vl.volumeId[2] = xnvlentry->volumeId[2];
@@ -859,7 +858,7 @@ convert_vlentry(int new, int fromvers, int tovers,
             1 ? sizeof(struct vlheader_1) : sizeof(struct vlheader_2))
            - (fromvers ==
               1 ? sizeof(struct vlheader_1) : sizeof(struct vlheader_2));
-       memset((char *)&vl, 0, sizeof(struct vlentry_1));
+       memset(&vl, 0, sizeof(struct vlentry_1));
        vl.volumeId[0] = xnvlentry->volumeId[0];
        vl.volumeId[1] = xnvlentry->volumeId[1];
        vl.volumeId[2] = xnvlentry->volumeId[2];