X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fvlserver%2Fcnvldb.h;h=fc9a8466cc9569298ea732808a33c9452458135f;hp=5aef6cb07d21fa2d0987d1bd4b7a3c0e363a810f;hb=38db9afbe9b2201b97f08b3068577a1270071cb9;hpb=fb5bcd00fc6f1560d7d02115a0b5beaa3014a0e7

diff --git a/src/vlserver/cnvldb.h b/src/vlserver/cnvldb.h
index 5aef6cb..fc9a846 100644
--- a/src/vlserver/cnvldb.h
+++ b/src/vlserver/cnvldb.h
@@ -9,123 +9,103 @@
 
 /* VLDB structures for VLDB version 1. */
 struct vital_vlheader_1 {
-    afs_int32    vldbversion;	
-    afs_int32    headersize;		
-    afs_int32    freePtr;		
-    afs_int32    eofPtr;		
-    afs_int32    allocs;		
-    afs_int32    frees;		
-    afs_int32    MaxVolumeId;	
-    afs_int32    totalEntries[3];
+    afs_int32 vldbversion;
+    afs_int32 headersize;
+    afs_int32 freePtr;
+    afs_int32 eofPtr;
+    afs_int32 allocs;
+    afs_int32 frees;
+    afs_int32 MaxVolumeId;
+    afs_int32 totalEntries[3];
 };
 
-typedef  struct vital_vlheader_1 vital_vlheader1;
+typedef struct vital_vlheader_1 vital_vlheader1;
 
 struct vlheader_1 {
-    vital_vlheader1  vital_header; 
-    afs_int32    IpMappedAddr[31];  
-    afs_int32    VolnameHash[8191];	  
-    afs_int32    VolidHash[3][8191];
+    vital_vlheader1 vital_header;
+    afs_uint32 IpMappedAddr[31];
+    afs_int32 VolnameHash[8191];
+    afs_int32 VolidHash[3][8191];
 };
 struct vlentry_1 {
-    afs_int32    volumeId[3]; 
-    afs_int32    flags;		
-    afs_int32    LockAfsId;		
-    afs_int32    LockTimestamp;	
-    afs_int32    cloneId;		
-    afs_int32    spares0;
-    afs_int32    nextIdHash[3];
-    afs_int32    nextNameHash;		
-    afs_int32    spares1[2];			
-    char    name[65];
-    char    spares3;			
-    unsigned char  serverNumber[8];	
-    unsigned char  serverPartition[8];
-    unsigned char  serverFlags[8];	
-    char    spares4;			
-    char    spares2[1];			
+    afs_uint32 volumeId[3];
+    afs_int32 flags;
+    afs_int32 LockAfsId;
+    afs_int32 LockTimestamp;
+    afs_uint32 cloneId;
+    afs_int32 spares0;
+    afs_int32 nextIdHash[3];
+    afs_int32 nextNameHash;
+    afs_int32 spares1[2];
+    char name[65];
+    char spares3;
+    unsigned char serverNumber[8];
+    unsigned char serverPartition[8];
+    unsigned char serverFlags[8];
+    char spares4;
+    char spares2[1];
 };
 
 /* VLDB structures for VLDB version 2. */
-typedef  struct vital_vlheader_1 vital_vlheader2;
+typedef struct vital_vlheader_1 vital_vlheader2;
 
 struct vlheader_2 {
-    vital_vlheader2  vital_header; 
-    afs_int32  IpMappedAddr[255];   /* == 0..254 */
-    afs_int32    VolnameHash[8191];	  
-    afs_int32    VolidHash[3][8191];
-    afs_int32    SIT;
+    vital_vlheader2 vital_header;
+    afs_uint32 IpMappedAddr[255];	/* == 0..254 */
+    afs_int32 VolnameHash[8191];
+    afs_int32 VolidHash[3][8191];
+    afs_int32 SIT;
 };
 
 struct vlentry_2 {
-    afs_int32  volumeId[3]; 
-    afs_int32    flags;		
-    afs_int32    LockAfsId;		
-    afs_int32    LockTimestamp;	
-    afs_int32    cloneId;		
-    afs_int32    spares0;
-    afs_int32    nextIdHash[3];
-    afs_int32    nextNameHash;		
-    afs_int32    spares1[2];			
-    char    name[65];
-    char    spares3;			
-    unsigned char  serverNumber[8];	
-    unsigned char  serverPartition[8];
-    unsigned char  serverFlags[8];	
-    char    spares4;			
-    char    spares2[1];			
+    afs_uint32 volumeId[3];
+    afs_int32 flags;
+    afs_int32 LockAfsId;
+    afs_int32 LockTimestamp;
+    afs_uint32 cloneId;
+    afs_int32 spares0;
+    afs_int32 nextIdHash[3];
+    afs_int32 nextNameHash;
+    afs_int32 spares1[2];
+    char name[65];
+    char spares3;
+    unsigned char serverNumber[8];
+    unsigned char serverPartition[8];
+    unsigned char serverFlags[8];
+    char spares4;
+    char spares2[1];
 };
 
-typedef  struct vital_vlheader_1 vital_vlheader3;
+typedef struct vital_vlheader_1 vital_vlheader3;
 
 struct vlheader_3 {
-    vital_vlheader3  vital_header; 
-    afs_int32  IpMappedAddr[255];   /* == 0..254 */
-    afs_int32    VolnameHash[8191];	  
-    afs_int32    VolidHash[3][8191];
-    afs_int32    SIT;
+    vital_vlheader3 vital_header;
+    afs_uint32 IpMappedAddr[255];	/* == 0..254 */
+    afs_int32 VolnameHash[8191];
+    afs_int32 VolidHash[3][8191];
+    afs_int32 SIT;
 };
 
 
 struct vlentry_3 {
-    afs_int32    volumeId[3]; 
-    afs_int32    flags;		
-    afs_int32    LockAfsId;		
-    afs_int32    LockTimestamp;	
-    afs_int32    cloneId;		
-    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];	
+    afs_uint32 volumeId[3];
+    afs_int32 flags;
+    afs_int32 LockAfsId;
+    afs_int32 LockTimestamp;
+    afs_uint32 cloneId;
+    afs_int32 nextIdHash[3];
+    afs_int32 nextNameHash;
+    char name[65];
+    unsigned char serverNumber[MAXSERVERS];
+    unsigned char serverPartition[MAXSERVERS];
+    unsigned char serverFlags[MAXSERVERS];
 
 #ifdef	obsolete_vldb_fields
-    afs_int32    spares0;			/* AssociatedChain */
-    afs_int32    spares1[0];			
-    afs_int32    spares1[1];			
-    char    spares3;			/* volumeType */
-    char    spares4;			/* RefCount */
-    char    spares2[1];			
+    afs_int32 spares0;		/* AssociatedChain */
+    afs_int32 spares1[0];
+    afs_int32 spares1[1];
+    char spares3;		/* volumeType */
+    char spares4;		/* RefCount */
+    char spares2[1];
 #endif
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-