vlserver: Use unsigned addresses

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

diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c
index cd93d50..823d7d6 100644 (file)
--- a/src/vlserver/vlclient.c
+++ b/src/vlserver/vlclient.c
@@ -37,6 +37,7 @@
 #endif
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 
 #include <afs/afsutil.h>
 #include <rx/xdr.h>
@@ -163,7 +164,7 @@ afs_int32
 GetServer(char *aname)
 {
     register struct hostent *th;
-    afs_int32 addr;
+    afs_uint32 addr;
     int b1, b2, b3, b4;
     register afs_int32 code;
 
@@ -636,7 +637,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 +725,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;
@@ -827,7 +828,7 @@ handleit(struct cmd_syndesc *as, void *arock)
                }
                free((char *)addrs.bulkaddrs_val);
            } else if (!strcmp(oper, "mhc")) {
-               afs_int32 serveraddrs[MAXSERVERID + 1][VL_MAXIPADDRS_PERMH];
+               afs_uint32 serveraddrs[MAXSERVERID + 1][VL_MAXIPADDRS_PERMH];
                afs_int32 serveraddrtype[MAXSERVERID + 1];
                int nentries1, nentries2, i, j, x, y, unique, found;
                afs_uint32 *addrp1, *addrp2;
@@ -1316,14 +1317,14 @@ GetArgs(char *line, char **args, int *nargs)
     *nargs = 0;
     while (*line) {
        register char *last = line;
-       while (*line == ' ')
+       while (isspace(*line))
            line++;
-       if (*last == ' ')
+       if (isspace(*last))
            *last = 0;
        if (!*line)
            break;
        *args++ = line, (*nargs)++;
-       while (*line && *line != ' ')
+       while (*line && !isspace(*line))
            line++;
     }
 }