volser: Use unsigned addresses and volume IDs

Fix code and header files in src/volser that use afs_int32 for server
IP addresses instead of afs_uint32 (the worst offenders being UV_*
functions). Also fix an instance of afs_int32 being used for a volume
ID, and remove 'struct volser_dest' instead of fixing it, since it is
completely unused.

Change-Id: I1008ed158855c2a22b4605b5a037f5e68731529e
Reviewed-on: http://gerrit.openafs.org/2249
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/volser/lockprocs.c b/src/volser/lockprocs.c
index 37ce2c0ea7a51f46fd6c6e92a88cd52f3c8cd00a..fa103ac38bb39779ea86081978cae3876700fb31 100644 (file)
--- a/src/volser/lockprocs.c
+++ b/src/volser/lockprocs.c
@@ -44,7 +44,7 @@
  * Zero is a valid partition field.
  */
 int
-FindIndex(struct nvldbentry *entry, afs_int32 server, afs_int32 part, afs_int32 type)
+FindIndex(struct nvldbentry *entry, afs_uint32 server, afs_int32 part, afs_int32 type)
 {
     int e;
     afs_int32 error = 0;
@@ -76,8 +76,8 @@ FindIndex(struct nvldbentry *entry, afs_int32 server, afs_int32 part, afs_int32
 
 /* Changes the rw site only */
 void
-SetAValue(struct nvldbentry *entry, afs_int32 oserver, afs_int32 opart,
-          afs_int32 nserver, afs_int32 npart, afs_int32 type)
+SetAValue(struct nvldbentry *entry, afs_uint32 oserver, afs_int32 opart,
+          afs_uint32 nserver, afs_int32 npart, afs_int32 type)
 {
     int e;
 
@@ -100,23 +100,23 @@ SetAValue(struct nvldbentry *entry, afs_int32 oserver, afs_int32 opart,
 
 /* Changes the RW site only */
 void
-Lp_SetRWValue(struct nvldbentry *entry, afs_int32 oserver, afs_int32 opart, 
-              afs_int32 nserver, afs_int32 npart)
+Lp_SetRWValue(struct nvldbentry *entry, afs_uint32 oserver, afs_int32 opart,
+              afs_uint32 nserver, afs_int32 npart)
 {
     SetAValue(entry, oserver, opart, nserver, npart, ITSRWVOL);
 }
 
 /* Changes the RO site only */
 void
-Lp_SetROValue(struct nvldbentry *entry, afs_int32 oserver, 
-              afs_int32 opart, afs_int32 nserver, afs_int32 npart)
+Lp_SetROValue(struct nvldbentry *entry, afs_uint32 oserver,
+              afs_int32 opart, afs_uint32 nserver, afs_int32 npart)
 {
     SetAValue(entry, oserver, opart, nserver, npart, ITSROVOL);
 }
 
 /* Returns success if this server and partition matches the RW entry */
 int 
-Lp_Match(afs_int32 server, afs_int32 part,
+Lp_Match(afs_uint32 server, afs_int32 part,
          struct nvldbentry *entry)
 {
     if (FindIndex(entry, server, part, ITSRWVOL) == -1)
@@ -126,7 +126,7 @@ Lp_Match(afs_int32 server, afs_int32 part,
 
 /* Return the index of the RO entry (plus 1) if it exists, else return 0 */
 int 
-Lp_ROMatch(afs_int32 server, afs_int32 part, struct nvldbentry *entry)
+Lp_ROMatch(afs_uint32 server, afs_int32 part, struct nvldbentry *entry)
 {
     return (FindIndex(entry, server, part, ITSROVOL) + 1);
 }

diff --git a/src/volser/lockprocs_prototypes.h b/src/volser/lockprocs_prototypes.h
index 8efab176d46d14688ae6d568c866ef3d07a73aa7..9c9e990742c7b2d4003fb4e4a6760e2d4369a782 100644 (file)
--- a/src/volser/lockprocs_prototypes.h
+++ b/src/volser/lockprocs_prototypes.h
@@ -1,14 +1,14 @@
 #ifndef        _LOCKPROCS_PROTOTYPES_H
 #define _LOCKPROCS_PROTOTYPES_H
-extern int FindIndex(struct nvldbentry *entry, afs_int32 server, afs_int32 part, afs_int32 type);
-extern void SetAValue(struct nvldbentry *entry, afs_int32 oserver, afs_int32 opart,
-          afs_int32 nserver, afs_int32 npart, afs_int32 type);
-extern void Lp_SetRWValue(struct nvldbentry *entry, afs_int32 oserver, afs_int32 opart, 
-              afs_int32 nserver, afs_int32 npart);
-extern void Lp_SetROValue(struct nvldbentry *entry, afs_int32 oserver, 
-              afs_int32 opart, afs_int32 nserver, afs_int32 npart);
-extern int Lp_Match(afs_int32 server, afs_int32 part, struct nvldbentry *entry);
-extern int Lp_ROMatch(afs_int32 server, afs_int32 part, struct nvldbentry *entry);
+extern int FindIndex(struct nvldbentry *entry, afs_uint32 server, afs_int32 part, afs_int32 type);
+extern void SetAValue(struct nvldbentry *entry, afs_uint32 oserver, afs_int32 opart,
+          afs_uint32 nserver, afs_int32 npart, afs_int32 type);
+extern void Lp_SetRWValue(struct nvldbentry *entry, afs_uint32 oserver, afs_int32 opart,
+              afs_uint32 nserver, afs_int32 npart);
+extern void Lp_SetROValue(struct nvldbentry *entry, afs_uint32 oserver,
+              afs_int32 opart, afs_uint32 nserver, afs_int32 npart);
+extern int Lp_Match(afs_uint32 server, afs_int32 part, struct nvldbentry *entry);
+extern int Lp_ROMatch(afs_uint32 server, afs_int32 part, struct nvldbentry *entry);
 extern int Lp_GetRwIndex(struct nvldbentry *entry);
 extern void Lp_QInit(struct qHead *ahead);
 extern void Lp_QAdd(struct qHead *ahead, struct aqueue *elem);

diff --git a/src/volser/physio.c b/src/volser/physio.c
index 620ed781860b43750e922480bfda87ed318de8e1..f458f8d8fa82d1f4e9aac87af159fbb220e05132 100644 (file)
--- a/src/volser/physio.c
+++ b/src/volser/physio.c
@@ -106,7 +106,7 @@ ReallyWrite(DirHandle * file, int block, char *data)
  * The handle needs to be dereferenced with the FidZap() routine.
  */
 void
-SetSalvageDirHandle(DirHandle * dir, afs_int32 volume, afs_int32 device,
+SetSalvageDirHandle(DirHandle * dir, afs_uint32 volume, afs_int32 device,
                     Inode inode)
 {
     private int SalvageCacheCheck = 1;

diff --git a/src/volser/physio.h b/src/volser/physio.h
index c5a36dd57bb605f5efd7c9fc28e104b0309b4592..8a10b5c206bc648c6652617d42609d5b8011286c 100644 (file)
--- a/src/volser/physio.h
+++ b/src/volser/physio.h
@@ -11,7 +11,7 @@
 #define _VOLSER_PHYSIO_H
 
 /* physio.c */
-extern void SetSalvageDirHandle(DirHandle *, afs_int32, afs_int32, Inode);
+extern void SetSalvageDirHandle(DirHandle *, afs_uint32, afs_int32, Inode);
 extern void FidZap(DirHandle *);
 
 #endif

diff --git a/src/volser/vol.h b/src/volser/vol.h
index 522fb97ee4eaeb6884fef42e6b772dac557dba0d..52f34c6a6570a20d1bcf5f0ba98e5ff1c1a3b842 100644 (file)
--- a/src/volser/vol.h
+++ b/src/volser/vol.h
@@ -18,7 +18,7 @@
 #include <afs/afssyscalls.h>
 
 typedef struct DirHandle {
-    int dirh_volume;
+    afs_uint32 dirh_volume;
     int dirh_device;
     Inode dirh_inode;
     afs_int32 dirh_cacheCheck;

diff --git a/src/volser/volser.p.h b/src/volser/volser.p.h
index afc9ac6004cefe5a5a40f71a13c5629c3aae9e96..d73350457f7e20bfc232341e5b436ff3528936d4 100644 (file)
--- a/src/volser/volser.p.h
+++ b/src/volser/volser.p.h
@@ -46,7 +46,7 @@ struct volser_trans {
     afs_int32 creationTime;    /* time the transaction started */
     afs_int32 returnCode;      /* transaction error code */
     struct Volume *volume;     /* pointer to open volume */
-    afs_int32 volid;           /* open volume's id */
+    afs_uint32 volid;          /* open volume's id */
     afs_int32 partition;       /* open volume's partition */
     afs_int32 dumpTransId;     /* other side's trans id during a dump */
     afs_int32 dumpSeq;         /* next sequence number to use during a dump */
@@ -69,12 +69,6 @@ struct volser_trans {
  */
 #define GCWAKEUP            30
 
-struct volser_dest {
-    afs_int32 destHost;
-    afs_int32 destPort;
-    afs_int32 destSSID;
-};
-
 #ifdef AFS_PTHREAD_ENV
 #define VTRANS_OBJ_LOCK_INIT(tt) \
   assert(pthread_mutex_init(&((tt)->lock),NULL) == 0)

diff --git a/src/volser/volser_internal.h b/src/volser/volser_internal.h
index fa98c7ac9a43c2fbdb17ff2b65a7127148e801f5..1624bf80a764b4dbe3f6dc9a7976c1f8f5d7a78b 100644 (file)
--- a/src/volser/volser_internal.h
+++ b/src/volser/volser_internal.h
@@ -20,7 +20,7 @@ extern afs_int32 split_volume(struct rx_call *, Volume *, Volume *,
 
 /* voltrans.c */
 extern struct volser_trans *FindTrans(afs_int32);
-extern struct volser_trans *NewTrans(afs_int32, afs_int32);
+extern struct volser_trans *NewTrans(afs_uint32, afs_int32);
 extern struct volser_trans *TransList(void);
 extern afs_int32 DeleteTrans(struct volser_trans *atrans, afs_int32 lock);
 extern afs_int32 TRELE (struct volser_trans *);
@@ -38,100 +38,100 @@ extern int PrintError(char *msg, afs_int32 errcode);
 extern void init_volintInfo(struct volintInfo *vinfo);
 extern void SubEnumerateEntry(struct nvldbentry *entry);
 extern void EnumerateEntry(struct nvldbentry *entry);
-extern int UV_NukeVolume(afs_int32 server, afs_int32 partid, afs_uint32 volid);
-extern int UV_PartitionInfo64(afs_int32 server, char *pname,
+extern int UV_NukeVolume(afs_uint32 server, afs_int32 partid, afs_uint32 volid);
+extern int UV_PartitionInfo64(afs_uint32 server, char *pname,
                            struct diskPartition64 *partition);
-extern int UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname,
+extern int UV_CreateVolume2(afs_uint32 aserver, afs_int32 apart, char *aname,
                            afs_int32 aquota, afs_int32 aspare1,
                            afs_int32 aspare2, afs_int32 aspare3,
                            afs_int32 aspare4, afs_uint32 * anewid);
-extern int UV_CreateVolume3(afs_int32 aserver, afs_int32 apart, char *aname,
+extern int UV_CreateVolume3(afs_uint32 aserver, afs_int32 apart, char *aname,
                            afs_int32 aquota, afs_int32 aspare1,
                            afs_int32 aspare2, afs_int32 aspare3,
                            afs_int32 aspare4, afs_uint32 * anewid,
                            afs_uint32 * aroid, afs_uint32 * abkid);
-extern int UV_AddVLDBEntry(afs_int32 aserver, afs_int32 apart, char *aname,
+extern int UV_AddVLDBEntry(afs_uint32 aserver, afs_int32 apart, char *aname,
                           afs_uint32 aid);
-extern int UV_MoveVolume(afs_uint32 afromvol, afs_int32 afromserver,
-                        afs_int32 afrompart, afs_int32 atoserver,
+extern int UV_MoveVolume(afs_uint32 afromvol, afs_uint32 afromserver,
+                        afs_int32 afrompart, afs_uint32 atoserver,
                         afs_int32 atopart);
-extern int UV_MoveVolume2(afs_uint32 afromvol, afs_int32 afromserver, 
-                          afs_int32 afrompart, afs_int32 atoserver, 
+extern int UV_MoveVolume2(afs_uint32 afromvol, afs_uint32 afromserver,
+                          afs_int32 afrompart, afs_uint32 atoserver,
                           afs_int32 atopart, int flags);
-extern int UV_BackupVolume(afs_int32 aserver, afs_int32 apart,
+extern int UV_BackupVolume(afs_uint32 aserver, afs_int32 apart,
                           afs_uint32 avolid);
-extern int UV_ReleaseVolume(afs_uint32 afromvol, afs_int32 afromserver,
+extern int UV_ReleaseVolume(afs_uint32 afromvol, afs_uint32 afromserver,
                            afs_int32 afrompart, int forceflag);
 extern void dump_sig_handler(int x);
-extern int UV_DumpVolume(afs_uint32 afromvol, afs_int32 afromserver,
+extern int UV_DumpVolume(afs_uint32 afromvol, afs_uint32 afromserver,
                         afs_int32 afrompart, afs_int32 fromdate,
                         afs_int32(*DumpFunction) (struct rx_call *, void *),
                         void *rock, afs_int32 flags);
-extern int UV_RestoreVolume2(afs_int32 toserver, afs_int32 topart,
-                            afs_uint32 tovolid, afs_int32 toparentid,
+extern int UV_RestoreVolume2(afs_uint32 toserver, afs_int32 topart,
+                            afs_uint32 tovolid, afs_uint32 toparentid,
                             char tovolname[], int flags,
                              afs_int32(*WriteData) (struct rx_call *, void *),
                             void *rock);
 extern int UV_LockRelease(afs_uint32 volid);
-extern int UV_AddSite(afs_int32 server, afs_int32 part, afs_uint32 volid,
+extern int UV_AddSite(afs_uint32 server, afs_int32 part, afs_uint32 volid,
                      afs_int32 valid);
-extern int UV_AddSite2(afs_int32 server, afs_int32 part, afs_uint32 volid,
+extern int UV_AddSite2(afs_uint32 server, afs_int32 part, afs_uint32 volid,
                       afs_uint32 rovolid, afs_int32 valid);
-extern int UV_RemoveSite(afs_int32 server, afs_int32 part, afs_uint32 volid);
-extern int UV_ChangeLocation(afs_int32 server, afs_int32 part,
+extern int UV_RemoveSite(afs_uint32 server, afs_int32 part, afs_uint32 volid);
+extern int UV_ChangeLocation(afs_uint32 server, afs_int32 part,
                             afs_uint32 volid);
-extern int UV_ListPartitions(afs_int32 aserver, struct partList *ptrPartList,
+extern int UV_ListPartitions(afs_uint32 aserver, struct partList *ptrPartList,
                             afs_int32 * cntp);
-extern int UV_ZapVolumeClones(afs_int32 aserver, afs_int32 apart,
+extern int UV_ZapVolumeClones(afs_uint32 aserver, afs_int32 apart,
                              struct volDescription *volPtr,
                              afs_int32 arraySize);
-extern int UV_GenerateVolumeClones(afs_int32 aserver, afs_int32 apart,
+extern int UV_GenerateVolumeClones(afs_uint32 aserver, afs_int32 apart,
                                   struct volDescription *volPtr,
                                   afs_int32 arraySize);
-extern int UV_ListVolumes(afs_int32 aserver, afs_int32 apart, int all,
+extern int UV_ListVolumes(afs_uint32 aserver, afs_int32 apart, int all,
                          struct volintInfo **resultPtr, afs_int32 * size);
-extern int UV_XListVolumes(afs_int32 a_serverID, afs_int32 a_partID,
+extern int UV_XListVolumes(afs_uint32 a_serverID, afs_int32 a_partID,
                           int a_all, struct volintXInfo **a_resultPP,
                           afs_int32 * a_numEntsInResultP);
-extern int UV_XListOneVolume(afs_int32 a_serverID, afs_int32 a_partID,
+extern int UV_XListOneVolume(afs_uint32 a_serverID, afs_int32 a_partID,
                             afs_uint32 a_volID,
                             struct volintXInfo **a_resultPP);
 extern int sortVolumes(const void *a, const void *b);
-extern int UV_SyncVolume(afs_int32 aserver, afs_int32 apart, char *avolname,
+extern int UV_SyncVolume(afs_uint32 aserver, afs_int32 apart, char *avolname,
                         int flags);
-extern int UV_SyncVldb(afs_int32 aserver, afs_int32 apart, int flags,
+extern int UV_SyncVldb(afs_uint32 aserver, afs_int32 apart, int flags,
                       int force);
-extern afs_int32 VolumeExists(afs_int32 server, afs_int32 partition,
+extern afs_int32 VolumeExists(afs_uint32 server, afs_int32 partition,
                              afs_uint32 volumeid);
 extern afs_int32 CheckVldbRWBK(struct nvldbentry *entry,
                               afs_int32 * modified);
 extern int CheckVldbRO(struct nvldbentry *entry, afs_int32 * modified);
 extern afs_int32 CheckVldb(struct nvldbentry *entry, afs_int32 * modified);
-extern int UV_SyncServer(afs_int32 aserver, afs_int32 apart, int flags,
+extern int UV_SyncServer(afs_uint32 aserver, afs_int32 apart, int flags,
                         int force);
 extern int UV_RenameVolume(struct nvldbentry *entry, char oldname[],
                           char newname[]);
-extern int UV_VolserStatus(afs_int32 server, transDebugInfo ** rpntr,
+extern int UV_VolserStatus(afs_uint32 server, transDebugInfo ** rpntr,
                           afs_int32 * rcount);
-extern int UV_VolumeZap(afs_int32 server, afs_int32 part, afs_uint32 volid);
-extern int UV_SetVolume(afs_int32 server, afs_int32 partition,
+extern int UV_VolumeZap(afs_uint32 server, afs_int32 part, afs_uint32 volid);
+extern int UV_SetVolume(afs_uint32 server, afs_int32 partition,
                        afs_uint32 volid, afs_int32 transflag,
                        afs_int32 setflag, int sleeptime);
-extern int UV_SetVolumeInfo(afs_int32 server, afs_int32 partition,
+extern int UV_SetVolumeInfo(afs_uint32 server, afs_int32 partition,
                            afs_uint32 volid, volintInfo * infop);
 extern void MapNetworkToHost(struct nvldbentry *old, struct nvldbentry *new);
-extern int UV_CopyVolume2(afs_uint32 afromvol, afs_int32 afromserver, 
+extern int UV_CopyVolume2(afs_uint32 afromvol, afs_uint32 afromserver,
                           afs_int32 afrompart, char *atovolname, 
-                          afs_int32 atoserver, afs_int32 atopart,
+                          afs_uint32 atoserver, afs_int32 atopart,
                           afs_uint32 atovolid, int flags);
-extern int UV_CloneVolume(afs_int32 aserver, afs_int32 apart, afs_uint32 avolid,
+extern int UV_CloneVolume(afs_uint32 aserver, afs_int32 apart, afs_uint32 avolid,
                           afs_uint32 acloneid, char *aname, int flags);
-extern int UV_DumpClonedVolume(afs_uint32 afromvol, afs_int32 afromserver,
+extern int UV_DumpClonedVolume(afs_uint32 afromvol, afs_uint32 afromserver,
                                afs_int32 afrompart, afs_int32 fromdate,
                                afs_int32(*DumpFunction)
                                          (struct rx_call *, void *),
                               void *rock, afs_int32 flags);
-extern int UV_GetSize(afs_uint32 afromvol, afs_int32 afromserver, 
+extern int UV_GetSize(afs_uint32 afromvol, afs_uint32 afromserver,
                       afs_int32 afrompart, afs_int32 fromdate, 
                       struct volintSize *vol_size);
 

diff --git a/src/volser/volser_prototypes.h b/src/volser/volser_prototypes.h
index cabaedefe4e9ce2c4ea965c72c303f5ab031525e..d2ec0a6f54be2ca6a57eee56a95b24f3f81eb87e 100644 (file)
--- a/src/volser/volser_prototypes.h
+++ b/src/volser/volser_prototypes.h
@@ -18,21 +18,21 @@ extern void MapPartIdIntoName(afs_int32 partId, char *partName);
 
 extern void MapHostToNetwork(struct nvldbentry *entry);
 
-extern struct rx_connection *UV_Bind(afs_int32 aserver, afs_int32 port);
+extern struct rx_connection *UV_Bind(afs_uint32 aserver, afs_int32 port);
 
-extern int UV_CreateVolume(afs_int32 aserver, afs_int32 apart, char *aname,
+extern int UV_CreateVolume(afs_uint32 aserver, afs_int32 apart, char *aname,
                           afs_uint32 * anewid);
 
-extern int UV_DeleteVolume(afs_int32 aserver, afs_int32 apart,
+extern int UV_DeleteVolume(afs_uint32 aserver, afs_int32 apart,
                           afs_uint32 avolid);
 
 extern int UV_SetSecurity(register struct rx_securityClass *as,
                           afs_int32 aindex);
 
-extern int UV_ListOneVolume(afs_int32 aserver, afs_int32 apart,
+extern int UV_ListOneVolume(afs_uint32 aserver, afs_int32 apart,
                            afs_uint32 volid, struct volintInfo **resultPtr);
 
-extern int UV_RestoreVolume(afs_int32 toserver, afs_int32 topart,
+extern int UV_RestoreVolume(afs_uint32 toserver, afs_int32 topart,
                            afs_uint32 tovolid, char tovolname[],
                            int restoreflags,
                            afs_int32(*WriteData) (struct rx_call *, void *),

diff --git a/src/volser/voltrans.c b/src/volser/voltrans.c
index dba02fd90d82e5355f83ab80b77e68a6a203a2ef..bb182c1f92234e1252ad802d92670d1ad81620b8 100644 (file)
--- a/src/volser/voltrans.c
+++ b/src/volser/voltrans.c
@@ -69,7 +69,7 @@ static afs_int32 transCounter = 1;
 
 /* create a new transaction, returning ptr to same with high ref count */
 struct volser_trans *
-NewTrans(afs_int32 avol, afs_int32 apart)
+NewTrans(afs_uint32 avol, afs_int32 apart)
 {
     /* set volid, next, partition */
     struct volser_trans *tt, *newtt;

diff --git a/src/volser/vos.c b/src/volser/vos.c
index a839b1769e0d3e9062c233522b954ad828953a17..ec86de6a6761a70389368b45488f6b2d6f513518 100644 (file)
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -74,7 +74,7 @@
 
 /* Local Prototypes */
 int PrintDiagnostics(char *astring, afs_int32 acode);
-int GetVolumeInfo(afs_uint32 volid, afs_int32 *server, afs_int32 *part, 
+int GetVolumeInfo(afs_uint32 volid, afs_uint32 *server, afs_int32 *part,
                   afs_int32 *voltype, struct nvldbentry *rentry);
 
 struct tqElem {
@@ -99,7 +99,7 @@ cmd_AddParm(ts, "-noresolve", CMD_FLAG, CMD_OPTIONAL, "don't resolve addresses")
 
 int rxInitDone = 0;
 struct rx_connection *tconn;
-afs_int32 tserver;
+afs_uint32 tserver;
 extern struct ubik_client *cstruct;
 const char *confdir;
 
@@ -203,11 +203,11 @@ IsNumeric(char *name)
 /*
  * Parse a server dotted address and return the address in network byte order
  */
-afs_int32
+afs_uint32
 GetServerNoresolve(char *aname)
 {
     int b1, b2, b3, b4;
-    afs_int32 addr;
+    afs_uint32 addr;
     afs_int32 code;
 
     code = sscanf(aname, "%d.%d.%d.%d", &b1, &b2, &b3, &b4);
@@ -221,11 +221,11 @@ GetServerNoresolve(char *aname)
 /*
  * Parse a server name/address and return the address in network byte order
  */
-afs_int32
+afs_uint32
 GetServer(char *aname)
 {
     register struct hostent *th;
-    afs_int32 addr; /* in network byte order */
+    afs_uint32 addr; /* in network byte order */
     register afs_int32 code;
     char hostname[MAXHOSTCHARS];
 
@@ -264,7 +264,7 @@ GetVolumeType(char *aname)
 }
 
 int
-IsPartValid(afs_int32 partId, afs_int32 server, afs_int32 *code)
+IsPartValid(afs_int32 partId, afs_uint32 server, afs_int32 *code)
 {
     struct partList dummyPartList;
     int i, success, cnt;
@@ -497,7 +497,7 @@ DumpFunction(struct rx_call *call, void *rock)
 }
 
 static void
-DisplayFormat(volintInfo *pntr, afs_int32 server, afs_int32 part,
+DisplayFormat(volintInfo *pntr, afs_uint32 server, afs_int32 part,
              int *totalOK, int *totalNotOK, int *totalBusy, int fast,
              int longlist, int disp)
 {
@@ -642,7 +642,7 @@ DisplayFormat(volintInfo *pntr, afs_int32 server, afs_int32 part,
  *------------------------------------------------------------------------*/
 
 static void
-XDisplayFormat(volintXInfo *a_xInfoP, afs_int32 a_servID, afs_int32 a_partID,
+XDisplayFormat(volintXInfo *a_xInfoP, afs_uint32 a_servID, afs_int32 a_partID,
               int *a_totalOKP, int *a_totalNotOKP, int *a_totalBusyP,
               int a_fast, int a_int32, int a_showProblems)
 {                              /*XDisplayFormat */
@@ -875,7 +875,7 @@ XDisplayFormat(volintXInfo *a_xInfoP, afs_int32 a_servID, afs_int32 a_partID,
  *------------------------------------------------------------------------*/
 
 static void
-XDisplayFormat2(volintXInfo *a_xInfoP, afs_int32 a_servID, afs_int32 a_partID,
+XDisplayFormat2(volintXInfo *a_xInfoP, afs_uint32 a_servID, afs_int32 a_partID,
                int *a_totalOKP, int *a_totalNotOKP, int *a_totalBusyP,
                int a_fast, int a_int32, int a_showProblems)
 {                              /*XDisplayFormat */
@@ -1163,7 +1163,7 @@ DisplayVolumes2(long server, long partition, volintInfo *pntr, long count)
 }
 
 static void
-DisplayVolumes(afs_int32 server, afs_int32 part, volintInfo *pntr,
+DisplayVolumes(afs_uint32 server, afs_int32 part, volintInfo *pntr,
               afs_int32 count, afs_int32 longlist, afs_int32 fast,
               int quiet)
 {
@@ -1229,7 +1229,7 @@ DisplayVolumes(afs_int32 server, afs_int32 part, volintInfo *pntr,
  *------------------------------------------------------------------------*/
 
 static void
-XDisplayVolumes(afs_int32 a_servID, afs_int32 a_partID, volintXInfo *a_xInfoP,
+XDisplayVolumes(afs_uint32 a_servID, afs_int32 a_partID, volintXInfo *a_xInfoP,
                afs_int32 a_count, afs_int32 a_int32, afs_int32 a_fast,
                int a_quiet)
 {                              /*XDisplayVolumes */
@@ -1313,7 +1313,7 @@ XDisplayVolumes(afs_int32 a_servID, afs_int32 a_partID, volintXInfo *a_xInfoP,
  *------------------------------------------------------------------------*/
 
 static void
-XDisplayVolumes2(afs_int32 a_servID, afs_int32 a_partID, volintXInfo *a_xInfoP,
+XDisplayVolumes2(afs_uint32 a_servID, afs_int32 a_partID, volintXInfo *a_xInfoP,
                 afs_int32 a_count, afs_int32 a_int32, afs_int32 a_fast,
                 int a_quiet)
 {                              /*XDisplayVolumes */
@@ -1377,7 +1377,7 @@ XDisplayVolumes2(afs_int32 a_servID, afs_int32 a_partID, volintXInfo *a_xInfoP,
 /* set <server> and <part> to the correct values depending on 
  * <voltype> and <entry> */
 static void
-GetServerAndPart(struct nvldbentry *entry, int voltype, afs_int32 *server,
+GetServerAndPart(struct nvldbentry *entry, int voltype, afs_uint32 *server,
                 afs_int32 *part, int *previdx)
 {
     int i, istart, vtype;
@@ -1488,7 +1488,7 @@ XVolumeStats(volintXInfo *a_xInfoP, struct nvldbentry *a_entryP,
 }                              /*XVolumeStats */
 
 static void
-VolumeStats_int(volintInfo *pntr, struct nvldbentry *entry, afs_int32 server, 
+VolumeStats_int(volintInfo *pntr, struct nvldbentry *entry, afs_uint32 server,
             afs_int32 part, int voltype)
 {
     int totalOK, totalNotOK, totalBusy;
@@ -1506,7 +1506,7 @@ NukeVolume(register struct cmd_syndesc *as)
     afs_uint32 volID;
     afs_int32  err;
     afs_int32 partID;
-    afs_int32 server;
+    afs_uint32 server;
     register char *tp;
 
     server = GetServer(tp = as->parms[0].items->data);
@@ -1575,7 +1575,8 @@ ExamineVolume(register struct cmd_syndesc *as, void *arock)
     afs_uint32 volid;
     afs_int32 code, err, error = 0;
     int voltype, foundserv = 0, foundentry = 0;
-    afs_int32 aserver, apart;
+    afs_uint32 aserver;
+    afs_int32 apart;
     int previdx = -1;
     int wantExtendedInfo;      /*Do we want extended vol info? */
 
@@ -1721,7 +1722,8 @@ SetFields(register struct cmd_syndesc *as, void *arock)
     volintInfo info;
     afs_uint32 volid;
     afs_int32 code, err;
-    afs_int32 aserver, apart;
+    afs_uint32 aserver;
+    afs_int32 apart;
     int previdx = -1;
 
     volid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);  /* -id */
@@ -1800,7 +1802,8 @@ SetFields(register struct cmd_syndesc *as, void *arock)
 static int
 volOnline(register struct cmd_syndesc *as, void *arock)
 {
-    afs_int32 server, partition;
+    afs_uint32 server;
+    afs_int32 partition;
     afs_uint32 volid;
     afs_int32 code, err = 0;
 
@@ -1860,7 +1863,8 @@ volOnline(register struct cmd_syndesc *as, void *arock)
 static int
 volOffline(register struct cmd_syndesc *as, void *arock)
 {
-    afs_int32 server, partition;
+    afs_uint32 server;
+    afs_int32 partition;
     afs_uint32 volid;
     afs_int32 code, err = 0;
     afs_int32 transflag, sleeptime, transdone;
@@ -2053,7 +2057,8 @@ static int
 DeleteVolume(struct cmd_syndesc *as, void *arock)
 {
     afs_int32 err, code = 0;
-    afs_int32 server = 0, partition = -1;
+    afs_uint32 server = 0;
+    afs_int32 partition = -1;
     afs_uint32 volid;
     char pname[10];
     afs_int32 idx, j;
@@ -2175,7 +2180,8 @@ MoveVolume(register struct cmd_syndesc *as, void *arock)
 {
 
     afs_uint32 volid;
-    afs_int32 fromserver, toserver, frompart, topart;
+    afs_uint32 fromserver, toserver;
+    afs_int32 frompart, topart;
     afs_int32 flags, code, err;
     char fromPartName[10], toPartName[10];
 
@@ -2302,7 +2308,8 @@ static int
 CopyVolume(register struct cmd_syndesc *as, void *arock)
 {
     afs_uint32 volid;
-    afs_int32 fromserver, toserver, frompart, topart, code, err, flags;
+    afs_uint32 fromserver, toserver;
+    afs_int32 frompart, topart, code, err, flags;
     char fromPartName[10], toPartName[10], *tovolume;
     struct nvldbentry entry;
     struct diskPartition64 partition;  /* for space check */
@@ -2449,7 +2456,8 @@ static int
 ShadowVolume(register struct cmd_syndesc *as, void *arock)
 {
     afs_uint32 volid, tovolid;
-    afs_int32 fromserver, toserver, frompart, topart;
+    afs_uint32 fromserver, toserver;
+    afs_int32 frompart, topart;
     afs_int32 code, err, flags;
     char fromPartName[10], toPartName[10], toVolName[32], *tovolume;
     struct diskPartition64 partition;  /* for space check */
@@ -2645,7 +2653,8 @@ static int
 CloneVolume(register struct cmd_syndesc *as, void *arock)
 {
     afs_uint32 volid, cloneid;
-    afs_int32 server, part, voltype;
+    afs_uint32 server;
+    afs_int32 part, voltype;
     char partName[10], *volname;
     afs_int32 code, err, flags;
     struct nvldbentry entry;
@@ -2759,11 +2768,13 @@ static int
 BackupVolume(register struct cmd_syndesc *as, void *arock)
 {
     afs_uint32 avolid;
-    afs_int32 aserver, apart, vtype, code, err;
+    afs_uint32 aserver;
+    afs_int32 apart, vtype, code, err;
     struct nvldbentry entry;
 
     afs_uint32 buvolid;
-    afs_int32 buserver, bupart, butype;
+    afs_uint32 buserver;
+    afs_int32 bupart, butype;
     struct nvldbentry buentry;
 
     avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
@@ -2831,7 +2842,8 @@ ReleaseVolume(register struct cmd_syndesc *as, void *arock)
 
     struct nvldbentry entry;
     afs_uint32 avolid;
-    afs_int32 aserver, apart, vtype, code, err;
+    afs_uint32 aserver;
+    afs_int32 apart, vtype, code, err;
     int force = 0;
 
     if (as->parms[1].items)
@@ -2875,7 +2887,8 @@ static int
 DumpVolumeCmd(register struct cmd_syndesc *as, void *arock)
 {
     afs_uint32 avolid;
-    afs_int32 aserver, apart, voltype, fromdate = 0, code, err, i, flags;
+    afs_uint32 aserver;
+    afs_int32 apart, voltype, fromdate = 0, code, err, i, flags;
     char filename[MAXPATHLEN];
     struct nvldbentry entry;
 
@@ -2976,7 +2989,8 @@ static int
 RestoreVolumeCmd(register struct cmd_syndesc *as, void *arock)
 {
     afs_uint32 avolid, aparentid;
-    afs_int32 aserver, apart, code, vcode, err;
+    afs_uint32 aserver;
+    afs_int32 apart, code, vcode, err;
     afs_int32 aoverwrite = ASK;
     afs_int32 acreation = 0, alastupdate = 0;
     int restoreflags = 0;
@@ -3134,7 +3148,8 @@ RestoreVolumeCmd(register struct cmd_syndesc *as, void *arock)
     }
 
     else {                     /* volume exists - do we do a full incremental or abort */
-       int Oserver, Opart, Otype, vol_elsewhere = 0;
+       afs_uint32 Oserver;
+       afs_int32 Opart, Otype, vol_elsewhere = 0;
        struct nvldbentry Oentry;
        int c, dc;
 
@@ -3298,7 +3313,8 @@ static int
 AddSite(register struct cmd_syndesc *as, void *arock)
 {
     afs_uint32 avolid;
-    afs_int32 aserver, apart, code, err, arovolid, valid = 0;
+    afs_uint32 aserver;
+    afs_int32 apart, code, err, arovolid, valid = 0;
     char apartName[10], avolname[VOLSER_MAXVOLNAME + 1];
 
     vsu_ExtractName(avolname, as->parms[2].items->data);;
@@ -3361,7 +3377,8 @@ RemoveSite(register struct cmd_syndesc *as, void *arock)
 {
 
     afs_uint32 avolid;
-    afs_int32 aserver, apart, code, err;
+    afs_uint32 aserver;
+    afs_int32 apart, code, err;
     char apartName[10], avolname[VOLSER_MAXVOLNAME + 1];
 
     vsu_ExtractName(avolname, as->parms[2].items->data);
@@ -3412,7 +3429,8 @@ static int
 ChangeLocation(register struct cmd_syndesc *as, void *arock)
 {
     afs_uint32 avolid;
-    afs_int32 aserver, apart, code, err;
+    afs_uint32 aserver;
+    afs_int32 apart, code, err;
     char apartName[10];
 
     avolid = vsu_GetVolumeID(as->parms[2].items->data, cstruct, &err);
@@ -3459,7 +3477,8 @@ ChangeLocation(register struct cmd_syndesc *as, void *arock)
 static int
 ListPartitions(register struct cmd_syndesc *as, void *arock)
 {
-    afs_int32 aserver, code;
+    afs_uint32 aserver;
+    afs_int32 code;
     struct partList dummyPartList;
     int i;
     char pname[10];
@@ -3618,7 +3637,8 @@ static int
 ListVolumes(register struct cmd_syndesc *as, void *arock)
 {
     afs_int32 apart, int32list, fast;
-    afs_int32 aserver, code;
+    afs_uint32 aserver;
+    afs_int32 code;
     volintInfo *pntr;
     volintInfo *oldpntr = NULL;
     afs_int32 count;
@@ -4019,7 +4039,8 @@ VolumeZap(register struct cmd_syndesc *as, void *arock)
 static int
 VolserStatus(register struct cmd_syndesc *as, void *arock)
 {
-    afs_int32 server, code;
+    afs_uint32 server;
+    afs_int32 code;
     transDebugInfo *pntr, *oldpntr;
     afs_int32 count;
     int i;
@@ -4170,7 +4191,7 @@ RenameVolume(register struct cmd_syndesc *as, void *arock)
 }
 
 int
-GetVolumeInfo(afs_uint32 volid, afs_int32 *server, afs_int32 *part, afs_int32 *voltype, 
+GetVolumeInfo(afs_uint32 volid, afs_uint32 *server, afs_int32 *part, afs_int32 *voltype,
               struct nvldbentry *rentry)
 {
     afs_int32 vcode;
@@ -4303,7 +4324,7 @@ DeleteEntry(register struct cmd_syndesc *as, void *arock)
     }
 
     if (as->parms[2].items) {  /* -server */
-       afs_int32 aserver;
+       afs_uint32 aserver;
        aserver = GetServer(as->parms[2].items->data);
        if (aserver == 0) {
            fprintf(STDERR, "vos: server '%s' not found in host table\n",
@@ -4454,7 +4475,8 @@ static int
 ListVLDB(struct cmd_syndesc *as, void *arock)
 {
     afs_int32 apart;
-    afs_int32 aserver, code;
+    afs_uint32 aserver;
+    afs_int32 code;
     afs_int32 vcode;
     struct VldbListByAttributes attributes;
     nbulkentries arrayEntries;
@@ -4625,7 +4647,8 @@ BackSys(register struct cmd_syndesc *as, void *arock)
 {
     afs_uint32 avolid;
     afs_int32 apart = 0;
-    afs_int32 aserver = 0, code, aserver1, apart1;
+    afs_uint32 aserver = 0, aserver1;
+    afs_int32 code, apart1;
     afs_int32 vcode;
     struct VldbListByAttributes attributes;
     nbulkentries arrayEntries;
@@ -4957,7 +4980,7 @@ static int
 UnlockVLDB(register struct cmd_syndesc *as, void *arock)
 {
     afs_int32 apart;
-    afs_int32 aserver = 0;
+    afs_uint32 aserver = 0;
     afs_int32 code;
     afs_int32 vcode;
     struct VldbListByAttributes attributes;
@@ -5087,7 +5110,8 @@ static int
 PartitionInfo(register struct cmd_syndesc *as, void *arock)
 {
     afs_int32 apart;
-    afs_int32 aserver, code;
+    afs_uint32 aserver;
+    afs_int32 code;
     char pname[10];
     struct diskPartition64 partition;
     struct partList dummyPartList;
@@ -5243,10 +5267,11 @@ print_addrs(const bulkaddrs * addrs, afsUUID * m_uuid, int nentries,
 {
     afs_int32 vcode, m_uniq=0;
     afs_int32 i, j;
-    afs_int32 *addrp;
+    afs_uint32 *addrp;
     bulkaddrs m_addrs;
     ListAddrByAttributes m_attrs;
-    afs_int32 m_nentries, *m_addrp;
+    afs_int32 m_nentries;
+    afs_uint32 *m_addrp;
     afs_int32 base, index;
     char buf[1024];
 
@@ -5256,7 +5281,7 @@ print_addrs(const bulkaddrs * addrs, afsUUID * m_uuid, int nentries,
     }
 
     /* print out the list of all the server */
-    addrp = (afs_int32 *) addrs->bulkaddrs_val;
+    addrp = (afs_uint32 *) addrs->bulkaddrs_val;
     for (i = 0; i < nentries; i++, addrp++) {
        /* If it is a multihomed address, then we will need to 
         * get the addresses for this multihomed server from
@@ -5285,7 +5310,7 @@ print_addrs(const bulkaddrs * addrs, afsUUID * m_uuid, int nentries,
                }
 
                /* Print the list */
-               m_addrp = (afs_int32 *) m_addrs.bulkaddrs_val;
+               m_addrp = (afs_uint32 *) m_addrs.bulkaddrs_val;
                for (j = 0; j < m_nentries; j++, m_addrp++) {
                    *m_addrp = htonl(*m_addrp);
                    if (noresolve) {
@@ -5353,7 +5378,7 @@ ListAddrs(register struct cmd_syndesc *as, void *arock)
     if (as->parms[1].items) {
        /* -host */
        struct hostent *he;
-       afs_int32 saddr;
+       afs_uint32 saddr;
        he = hostutil_GetHostByName((char *)as->parms[1].items->data);
        if (he == NULL) {
            fprintf(STDERR, "vos: Can't get host info for '%s'\n",
@@ -5449,7 +5474,7 @@ SetAddrs(register struct cmd_syndesc *as, void *arock)
     if (as->parms[1].items) {
        /* -host */
        struct cmd_item *ti;
-       afs_int32 saddr;
+       afs_uint32 saddr;
        int i = 0;
 
        for (ti = as->parms[1].items; ti && i < ADDRSPERSITE; ti = ti->next) {
@@ -5524,14 +5549,15 @@ ConvertRO(register struct cmd_syndesc *as, void *arock)
 {
     afs_int32 partition = -1;
     afs_uint32 volid;
-    afs_int32 server, code, i, same;
+    afs_uint32 server;
+    afs_int32 code, i, same;
     struct nvldbentry entry, storeEntry;
     afs_int32 vcode;
     afs_int32 rwindex = 0;
-    afs_int32 rwserver = 0;
+    afs_uint32 rwserver = 0;
     afs_int32 rwpartition = 0;
     afs_int32 roindex = 0;
-    afs_int32 roserver = 0;
+    afs_uint32 roserver = 0;
     afs_int32 ropartition = 0;
     int force = 0;
     struct rx_connection *aconn;
@@ -5688,7 +5714,8 @@ static int
 Sizes(register struct cmd_syndesc *as, void *arock)
 {
     afs_uint32 avolid;
-    afs_int32 aserver, apart, voltype, fromdate = 0, code, err, i;
+    afs_uint32 aserver;
+    afs_int32 apart, voltype, fromdate = 0, code, err, i;
     struct nvldbentry entry;
     volintSize vol_size;
 
@@ -5772,7 +5799,8 @@ Sizes(register struct cmd_syndesc *as, void *arock)
 static int
 EndTrans(register struct cmd_syndesc *as, void *arock)
 {
-    afs_int32 server, code, tid, rcode;
+    afs_uint32 server;
+    afs_int32 code, tid, rcode;
     struct rx_connection *aconn;
 
     server = GetServer(as->parms[0].items->data);

diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c
index 6487966c7c42444c820b6e773ac5ec7df79b063a..72c08382b957f18e459478be3bdc0d8badf7f991 100644 (file)
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -179,7 +179,7 @@ static int SimulateForwardMultiple(struct rx_connection *fromconn,
                                   afs_int32 fromtid, afs_int32 fromdate,
                                   manyDests * tr, afs_int32 flags,
                                   void *cookie, manyResults * results);
-static afs_int32 CheckVolume(volintInfo * volumeinfo, afs_int32 aserver,
+static afs_int32 CheckVolume(volintInfo * volumeinfo, afs_uint32 aserver,
                             afs_int32 apart, afs_int32 * modentry,
                             afs_uint32 * maxvolid);
 
@@ -445,7 +445,7 @@ UV_SetSecurity(register struct rx_securityClass *as, afs_int32 aindex)
 /* bind to volser on <port> <aserver> */
 /* takes server address in network order, port in host order.  dumb */
 struct rx_connection *
-UV_Bind(afs_int32 aserver, afs_int32 port)
+UV_Bind(afs_uint32 aserver, afs_int32 port)
 {
     register struct rx_connection *tc;
 
@@ -631,7 +631,7 @@ EnumerateEntry(struct nvldbentry *entry)
 
 /* forcibly remove a volume.  Very dangerous call */
 int
-UV_NukeVolume(afs_int32 server, afs_int32 partid, afs_uint32 volid)
+UV_NukeVolume(afs_uint32 server, afs_int32 partid, afs_uint32 volid)
 {
     register struct rx_connection *tconn;
     register afs_int32 code;
@@ -647,7 +647,7 @@ UV_NukeVolume(afs_int32 server, afs_int32 partid, afs_uint32 volid)
 
 /* like df. Return usage of <pname> on <server> in <partition> */
 int
-UV_PartitionInfo64(afs_int32 server, char *pname,
+UV_PartitionInfo64(afs_uint32 server, char *pname,
                   struct diskPartition64 *partition)
 {
     register struct rx_connection *aconn;
@@ -680,7 +680,7 @@ UV_PartitionInfo64(afs_int32 server, char *pname,
 
 /* old interface to create volumes */
 int
-UV_CreateVolume(afs_int32 aserver, afs_int32 apart, char *aname,
+UV_CreateVolume(afs_uint32 aserver, afs_int32 apart, char *aname,
                afs_uint32 * anewid)
 {
     afs_int32 code;
@@ -691,7 +691,7 @@ UV_CreateVolume(afs_int32 aserver, afs_int32 apart, char *aname,
 
 /* less old interface to create volumes */
 int
-UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname,
+UV_CreateVolume2(afs_uint32 aserver, afs_int32 apart, char *aname,
                 afs_int32 aquota, afs_int32 aspare1, afs_int32 aspare2,
                 afs_int32 aspare3, afs_int32 aspare4, afs_uint32 * anewid)
 {
@@ -718,7 +718,7 @@ UV_CreateVolume2(afs_int32 aserver, afs_int32 apart, char *aname,
  * @return 0 on success, error code otherwise.
  */
 int
-UV_CreateVolume3(afs_int32 aserver, afs_int32 apart, char *aname,
+UV_CreateVolume3(afs_uint32 aserver, afs_int32 apart, char *aname,
                 afs_int32 aquota, afs_int32 aspare1, afs_int32 aspare2,
                 afs_int32 aspare3, afs_int32 aspare4, afs_uint32 * anewid,
                 afs_uint32 * aroid, afs_uint32 * abkid)
@@ -852,7 +852,7 @@ UV_CreateVolume3(afs_int32 aserver, afs_int32 apart, char *aname,
 /* create a volume, given a server, partition number, volume name --> sends
 * back new vol id in <anewid>*/
 int
-UV_AddVLDBEntry(afs_int32 aserver, afs_int32 apart, char *aname,
+UV_AddVLDBEntry(afs_uint32 aserver, afs_int32 apart, char *aname,
                afs_uint32 aid)
 {
     register struct rx_connection *aconn;
@@ -907,7 +907,7 @@ UV_AddVLDBEntry(afs_int32 aserver, afs_int32 apart, char *aname,
  * becomes zero
  */
 int
-UV_DeleteVolume(afs_int32 aserver, afs_int32 apart, afs_uint32 avolid)
+UV_DeleteVolume(afs_uint32 aserver, afs_int32 apart, afs_uint32 avolid)
 {
     struct rx_connection *aconn = (struct rx_connection *)0;
     afs_int32 ttid = 0;
@@ -1186,8 +1186,8 @@ sigint_handler(int x)
  */
 
 int
-UV_MoveVolume2(afs_uint32 afromvol, afs_int32 afromserver, afs_int32 afrompart,
-              afs_int32 atoserver, afs_int32 atopart, int flags)
+UV_MoveVolume2(afs_uint32 afromvol, afs_uint32 afromserver, afs_int32 afrompart,
+              afs_uint32 atoserver, afs_int32 atopart, int flags)
 {
     /* declare stuff 'volatile' that may be used from setjmp/longjmp and may
      * be changing during the move */
@@ -2200,8 +2200,8 @@ UV_MoveVolume2(afs_uint32 afromvol, afs_int32 afromserver, afs_int32 afrompart,
 
 
 int
-UV_MoveVolume(afs_uint32 afromvol, afs_int32 afromserver, afs_int32 afrompart,
-             afs_int32 atoserver, afs_int32 atopart)
+UV_MoveVolume(afs_uint32 afromvol, afs_uint32 afromserver, afs_int32 afrompart,
+             afs_uint32 atoserver, afs_int32 atopart)
 {
     return UV_MoveVolume2(afromvol, afromserver, afrompart,
                          atoserver, atopart, 0);
@@ -2220,8 +2220,8 @@ UV_MoveVolume(afs_uint32 afromvol, afs_int32 afromserver, afs_int32 afrompart,
  *     RV_NOCLONE - don't use a copy clone
  */
 int
-UV_CopyVolume2(afs_uint32 afromvol, afs_int32 afromserver, afs_int32 afrompart,
-              char *atovolname, afs_int32 atoserver, afs_int32 atopart,
+UV_CopyVolume2(afs_uint32 afromvol, afs_uint32 afromserver, afs_int32 afrompart,
+              char *atovolname, afs_uint32 atoserver, afs_int32 atopart,
               afs_uint32 atovolid, int flags)
 {
     /* declare stuff 'volatile' that may be used from setjmp/longjmp and may
@@ -2742,8 +2742,8 @@ cpincr:
 
 
 int
-UV_CopyVolume(afs_uint32 afromvol, afs_int32 afromserver, afs_int32 afrompart,
-             char *atovolname, afs_int32 atoserver, afs_int32 atopart)
+UV_CopyVolume(afs_uint32 afromvol, afs_uint32 afromserver, afs_int32 afrompart,
+             char *atovolname, afs_uint32 atoserver, afs_int32 atopart)
 {
     return UV_CopyVolume2(afromvol, afromserver, afrompart,
                           atovolname, atoserver, atopart, 0, 0);
@@ -2756,7 +2756,7 @@ UV_CopyVolume(afs_uint32 afromvol, afs_int32 afromserver, afs_int32 afrompart,
  */
 
 int
-UV_BackupVolume(afs_int32 aserver, afs_int32 apart, afs_uint32 avolid)
+UV_BackupVolume(afs_uint32 aserver, afs_int32 apart, afs_uint32 avolid)
 {
     struct rx_connection *aconn = (struct rx_connection *)0;
     afs_int32 ttid = 0, btid = 0;
@@ -3017,7 +3017,7 @@ UV_BackupVolume(afs_int32 aserver, afs_int32 apart, afs_uint32 avolid)
  */
 
 int
-UV_CloneVolume(afs_int32 aserver, afs_int32 apart, afs_uint32 avolid,
+UV_CloneVolume(afs_uint32 aserver, afs_int32 apart, afs_uint32 avolid,
               afs_uint32 acloneid, char *aname, int flags)
 {
     struct rx_connection *aconn = (struct rx_connection *)0;
@@ -3374,7 +3374,7 @@ SimulateForwardMultiple(struct rx_connection *fromconn, afs_int32 fromtid,
  */
 
 int
-UV_ReleaseVolume(afs_uint32 afromvol, afs_int32 afromserver,
+UV_ReleaseVolume(afs_uint32 afromvol, afs_uint32 afromserver,
                 afs_int32 afrompart, int forceflag)
 {
     char vname[64];
@@ -4079,7 +4079,7 @@ dump_sig_handler(int x)
  * extracting parameters from the rock 
  */
 int
-UV_DumpVolume(afs_uint32 afromvol, afs_int32 afromserver, afs_int32 afrompart,
+UV_DumpVolume(afs_uint32 afromvol, afs_uint32 afromserver, afs_int32 afrompart,
              afs_int32 fromdate,
              afs_int32(*DumpFunction) (struct rx_call *, void *), void *rock,
              afs_int32 flags)
@@ -4172,7 +4172,7 @@ UV_DumpVolume(afs_uint32 afromvol, afs_int32 afromserver, afs_int32 afrompart,
  * extracting parameters from the rock 
  */
 int
-UV_DumpClonedVolume(afs_uint32 afromvol, afs_int32 afromserver,
+UV_DumpClonedVolume(afs_uint32 afromvol, afs_uint32 afromserver,
                    afs_int32 afrompart, afs_int32 fromdate,
                    afs_int32(*DumpFunction) (struct rx_call *, void *),
                    void *rock, afs_int32 flags)
@@ -4327,8 +4327,8 @@ UV_DumpClonedVolume(afs_uint32 afromvol, afs_int32 afromserver,
  * after extracting params from the rock 
  */
 int
-UV_RestoreVolume2(afs_int32 toserver, afs_int32 topart, afs_uint32 tovolid,
-                 afs_int32 toparentid, char tovolname[], int flags,
+UV_RestoreVolume2(afs_uint32 toserver, afs_int32 topart, afs_uint32 tovolid,
+                 afs_uint32 toparentid, char tovolname[], int flags,
                  afs_int32(*WriteData) (struct rx_call *, void *),
                  void *rock)
 {
@@ -4810,7 +4810,7 @@ UV_RestoreVolume2(afs_int32 toserver, afs_int32 topart, afs_uint32 tovolid,
 }
 
 int
-UV_RestoreVolume(afs_int32 toserver, afs_int32 topart, afs_uint32 tovolid,
+UV_RestoreVolume(afs_uint32 toserver, afs_int32 topart, afs_uint32 tovolid,
                 char tovolname[], int flags,
                 afs_int32(*WriteData) (struct rx_call *, void *),
                 void *rock)
@@ -4844,7 +4844,7 @@ UV_LockRelease(afs_uint32 volid)
 
 /* old interface to add rosites */
 int
-UV_AddSite(afs_int32 server, afs_int32 part, afs_uint32 volid,
+UV_AddSite(afs_uint32 server, afs_int32 part, afs_uint32 volid,
           afs_int32 valid)
 {
     return UV_AddSite2(server, part, volid, 0, valid);
@@ -4853,7 +4853,7 @@ UV_AddSite(afs_int32 server, afs_int32 part, afs_uint32 volid,
 /*adds <server> and <part> as a readonly replication site for <volid>
 *in vldb */
 int
-UV_AddSite2(afs_int32 server, afs_int32 part, afs_uint32 volid,
+UV_AddSite2(afs_uint32 server, afs_int32 part, afs_uint32 volid,
            afs_uint32 rovolid, afs_int32 valid)
 {
     int j, nro = 0, islocked = 0;
@@ -4984,7 +4984,7 @@ UV_AddSite2(afs_int32 server, afs_int32 part, afs_uint32 volid,
 
 /*removes <server> <part> as read only site for <volid> from the vldb */
 int
-UV_RemoveSite(afs_int32 server, afs_int32 part, afs_uint32 volid)
+UV_RemoveSite(afs_uint32 server, afs_int32 part, afs_uint32 volid)
 {
     afs_int32 vcode;
     struct nvldbentry entry, storeEntry;
@@ -5064,7 +5064,7 @@ UV_RemoveSite(afs_int32 server, afs_int32 part, afs_uint32 volid)
 
 /*sets <server> <part> as read/write site for <volid> in the vldb */
 int
-UV_ChangeLocation(afs_int32 server, afs_int32 part, afs_uint32 volid)
+UV_ChangeLocation(afs_uint32 server, afs_int32 part, afs_uint32 volid)
 {
     afs_int32 vcode;
     struct nvldbentry entry, storeEntry;
@@ -5125,7 +5125,7 @@ UV_ChangeLocation(afs_int32 server, afs_int32 part, afs_uint32 volid)
 
 /*list all the partitions on <aserver> */
 int
-UV_ListPartitions(afs_int32 aserver, struct partList *ptrPartList,
+UV_ListPartitions(afs_uint32 aserver, struct partList *ptrPartList,
                  afs_int32 * cntp)
 {
     struct rx_connection *aconn;
@@ -5183,7 +5183,7 @@ UV_ListPartitions(afs_int32 aserver, struct partList *ptrPartList,
 /*zap the list of volumes specified by volPtrArray (the volCloneId field).
  This is used by the backup system */
 int
-UV_ZapVolumeClones(afs_int32 aserver, afs_int32 apart,
+UV_ZapVolumeClones(afs_uint32 aserver, afs_int32 apart,
                   struct volDescription *volPtr, afs_int32 arraySize)
 {
     struct rx_connection *aconn;
@@ -5234,7 +5234,7 @@ UV_ZapVolumeClones(afs_int32 aserver, afs_int32 apart,
 /*return a list of clones of the volumes specified by volPtrArray. Used by the 
  backup system */
 int
-UV_GenerateVolumeClones(afs_int32 aserver, afs_int32 apart,
+UV_GenerateVolumeClones(afs_uint32 aserver, afs_int32 apart,
                        struct volDescription *volPtr, afs_int32 arraySize)
 {
     struct rx_connection *aconn;
@@ -5322,7 +5322,7 @@ UV_GenerateVolumeClones(afs_int32 aserver, afs_int32 apart,
 /*list all the volumes on <aserver> and <apart>. If all = 1, then all the
 * relevant fields of the volume are also returned. This is a heavy weight operation.*/
 int
-UV_ListVolumes(afs_int32 aserver, afs_int32 apart, int all,
+UV_ListVolumes(afs_uint32 aserver, afs_int32 apart, int all,
               struct volintInfo **resultPtr, afs_int32 * size)
 {
     struct rx_connection *aconn;
@@ -5386,7 +5386,7 @@ UV_ListVolumes(afs_int32 aserver, afs_int32 apart, int all,
  *------------------------------------------------------------------------*/
 
 int
-UV_XListVolumes(afs_int32 a_serverID, afs_int32 a_partID, int a_all,
+UV_XListVolumes(afs_uint32 a_serverID, afs_int32 a_partID, int a_all,
                struct volintXInfo **a_resultPP,
                afs_int32 * a_numEntsInResultP)
 {
@@ -5434,7 +5434,7 @@ UV_XListVolumes(afs_int32 a_serverID, afs_int32 a_partID, int a_all,
 
 /* get all the information about volume <volid> on <aserver> and <apart> */
 int
-UV_ListOneVolume(afs_int32 aserver, afs_int32 apart, afs_uint32 volid,
+UV_ListOneVolume(afs_uint32 aserver, afs_int32 apart, afs_uint32 volid,
                 struct volintInfo **resultPtr)
 {
     struct rx_connection *aconn;
@@ -5493,7 +5493,7 @@ UV_ListOneVolume(afs_int32 aserver, afs_int32 apart, afs_uint32 volid,
  *------------------------------------------------------------------------*/
 
 int
-UV_XListOneVolume(afs_int32 a_serverID, afs_int32 a_partID, afs_uint32 a_volID,
+UV_XListOneVolume(afs_uint32 a_serverID, afs_int32 a_partID, afs_uint32 a_volID,
                  struct volintXInfo **a_resultPP)
 {
     struct rx_connection *rxConnP;     /*Rx connection to Volume Server */
@@ -5555,7 +5555,7 @@ UV_XListOneVolume(afs_int32 a_serverID, afs_int32 a_partID, afs_uint32 a_volID,
  *    Output changed to look a lot like the "vos syncserv" otuput.
  */
 static afs_int32
-CheckVolume(volintInfo * volumeinfo, afs_int32 aserver, afs_int32 apart,
+CheckVolume(volintInfo * volumeinfo, afs_uint32 aserver, afs_int32 apart,
            afs_int32 * modentry, afs_uint32 * maxvolid)
 {
     int idx = 0;
@@ -6034,7 +6034,7 @@ sortVolumes(const void *a, const void *b)
  *      if the volume exists on specified servers (similar to syncvldb).
  */
 int
-UV_SyncVolume(afs_int32 aserver, afs_int32 apart, char *avolname, int flags)
+UV_SyncVolume(afs_uint32 aserver, afs_int32 apart, char *avolname, int flags)
 {
     struct rx_connection *aconn = 0;
     afs_int32 j, k, code, vcode, error = 0;
@@ -6277,7 +6277,7 @@ UV_SyncVolume(afs_int32 aserver, afs_int32 apart, char *avolname, int flags)
  *      optionally, <apart>.
  */
 int
-UV_SyncVldb(afs_int32 aserver, afs_int32 apart, int flags, int force)
+UV_SyncVldb(afs_uint32 aserver, afs_int32 apart, int flags, int force)
 {
     struct rx_connection *aconn;
     afs_int32 code, error = 0;
@@ -6432,7 +6432,7 @@ UV_SyncVldb(afs_int32 aserver, afs_int32 apart, int flags, int force)
  *      still exists - so we catch these error codes.
  */
 afs_int32
-VolumeExists(afs_int32 server, afs_int32 partition, afs_uint32 volumeid)
+VolumeExists(afs_uint32 server, afs_int32 partition, afs_uint32 volumeid)
 {
     struct rx_connection *conn = (struct rx_connection *)0;
     afs_int32 code = -1;
@@ -6770,7 +6770,7 @@ CheckVldb(struct nvldbentry * entry, afs_int32 * modified)
  *      Synchronise <aserver> <apart>(if flags = 1) with the VLDB.
  */
 int
-UV_SyncServer(afs_int32 aserver, afs_int32 apart, int flags, int force)
+UV_SyncServer(afs_uint32 aserver, afs_int32 apart, int flags, int force)
 {
     struct rx_connection *aconn;
     afs_int32 code, error = 0;
@@ -7109,7 +7109,7 @@ UV_RenameVolume(struct nvldbentry *entry, char oldname[], char newname[])
 
 /*report on all the active transactions on volser */
 int
-UV_VolserStatus(afs_int32 server, transDebugInfo ** rpntr, afs_int32 * rcount)
+UV_VolserStatus(afs_uint32 server, transDebugInfo ** rpntr, afs_int32 * rcount)
 {
     struct rx_connection *aconn;
     transDebugEntries transInfo;
@@ -7141,7 +7141,7 @@ UV_VolserStatus(afs_int32 server, transDebugInfo ** rpntr, afs_int32 * rcount)
 
 /*delete the volume without interacting with the vldb */
 int
-UV_VolumeZap(afs_int32 server, afs_int32 part, afs_uint32 volid)
+UV_VolumeZap(afs_uint32 server, afs_int32 part, afs_uint32 volid)
 {
     afs_int32 rcode, ttid, error, code;
     struct rx_connection *aconn;
@@ -7190,7 +7190,7 @@ UV_VolumeZap(afs_int32 server, afs_int32 part, afs_uint32 volid)
 }
 
 int
-UV_SetVolume(afs_int32 server, afs_int32 partition, afs_uint32 volid,
+UV_SetVolume(afs_uint32 server, afs_int32 partition, afs_uint32 volid,
             afs_int32 transflag, afs_int32 setflag, int sleeptime)
 {
     struct rx_connection *conn = 0;
@@ -7240,7 +7240,7 @@ UV_SetVolume(afs_int32 server, afs_int32 partition, afs_uint32 volid,
 }
 
 int
-UV_SetVolumeInfo(afs_int32 server, afs_int32 partition, afs_uint32 volid,
+UV_SetVolumeInfo(afs_uint32 server, afs_int32 partition, afs_uint32 volid,
                 volintInfo * infop)
 {
     struct rx_connection *conn = 0;
@@ -7282,7 +7282,7 @@ UV_SetVolumeInfo(afs_int32 server, afs_int32 partition, afs_uint32 volid,
 }
 
 int
-UV_GetSize(afs_uint32 afromvol, afs_int32 afromserver, afs_int32 afrompart,
+UV_GetSize(afs_uint32 afromvol, afs_uint32 afromserver, afs_int32 afrompart,
           afs_int32 fromdate, struct volintSize *vol_size)
 {
     struct rx_connection *aconn = (struct rx_connection *)0;

diff --git a/src/volser/vsutils.c b/src/volser/vsutils.c
index 6af0b7ce4e15d2af7ffbb63ab4bfec76c39afba0..caae8d7584514a042d52d193872f4313dc4d65e0 100644 (file)
--- a/src/volser/vsutils.c
+++ b/src/volser/vsutils.c
@@ -267,7 +267,7 @@ VLDB_ListAttributesN2(VldbListByAttributes *attrp,
 
 static int vlserverv4 = -1;
 struct cacheips {
-    afs_int32 server;
+    afs_uint32 server;
     afs_int32 count;
     afs_uint32 addrs[16];
 };
@@ -281,7 +281,7 @@ struct cacheips cacheips[GETADDRUCACHESIZE];
 int cacheip_index = 0;
 
 int
-VLDB_IsSameAddrs(afs_int32 serv1, afs_int32 serv2, afs_int32 *errorp)
+VLDB_IsSameAddrs(afs_uint32 serv1, afs_uint32 serv2, afs_int32 *errorp)
 {
     register int code;
     ListAddrByAttributes attrs;

diff --git a/src/volser/vsutils_prototypes.h b/src/volser/vsutils_prototypes.h
index 2460077cc32811cd049829cac137c10d56d8fd7b..042e91a6cfae72f19f627ef3ad341a35fda0cf60 100644 (file)
--- a/src/volser/vsutils_prototypes.h
+++ b/src/volser/vsutils_prototypes.h
@@ -9,7 +9,7 @@ extern int VLDB_ReplaceEntry(afs_uint32 volid, afs_int32 voltype, struct nvldben
 extern int VLDB_ListAttributes(VldbListByAttributes *attrp, afs_int32 *entriesp, nbulkentries *blkentriesp);
 extern int VLDB_ListAttributesN2(VldbListByAttributes *attrp, char *name, afs_int32 thisindex,
            afs_int32 *nentriesp, nbulkentries *blkentriesp, afs_int32 *nextindexp);
-extern int VLDB_IsSameAddrs(afs_int32 serv1, afs_int32 serv2, afs_int32 *errorp);
+extern int VLDB_IsSameAddrs(afs_uint32 serv1, afs_uint32 serv2, afs_int32 *errorp);
 extern void vsu_SetCrypt(int cryptflag);
 extern afs_int32 vsu_ClientInit(int noAuthFlag, const char *confDir, char *cellName, afs_int32 sauth,
                struct ubik_client **uclientp, int (*secproc)(struct rx_securityClass *, afs_int32));