vlserver: Use unsigned addresses

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

diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c
index 6d591a4..80f263a 100644 (file)
--- a/src/vlserver/cnvldb.c
+++ b/src/vlserver/cnvldb.c
@@ -27,7 +27,6 @@
 #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 *);
@@ -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];