libadmin-vos-irix-fixes-20080421
[openafs.git] / src / libadmin / test / vos.c
index cd53b01..e374081 100644 (file)
@@ -1,11 +1,28 @@
-/* Copyright (C) 1998 Transarc Corporation - All rights reserved.
- *
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ * 
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
  */
 
 /*
  * This file implements the vos related funtions for afscp
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+#ifndef AFS_NT40_ENV
+#include <netdb.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <afs/afsutil.h>
+#endif
+
+RCSID
+    ("$Header$");
+
 #include "vos.h"
 
 /*
@@ -19,7 +36,8 @@
  */
 
 static unsigned int
-GetIntFromString(const char *int_str, const char *error_msg) {
+GetIntFromString(const char *int_str, const char *error_msg)
+{
     unsigned int i;
     char *bad_char = NULL;
 
@@ -37,7 +55,8 @@ GetIntFromString(const char *int_str, const char *error_msg) {
  */
 
 static unsigned int
-GetVolumeIdFromString(const char *volume) {
+GetVolumeIdFromString(const char *volume)
+{
     unsigned int volume_id;
     char *bad_char = NULL;
     afs_status_t st = 0;
@@ -52,8 +71,8 @@ GetVolumeIdFromString(const char *volume) {
      * We failed to convert the string to a number, so see if it
      * is a volume name
      */
-    if (vos_VLDBGet(cellHandle, 0, (const unsigned int *) 0, volume,
-                   &entry, &st)) {
+    if (vos_VLDBGet
+       (cellHandle, 0, (const unsigned int *)0, volume, &entry, &st)) {
        return entry.volumeId[VOS_READ_WRITE_VOLUME];
     } else {
        ERR_EXT("failed to convert specified volume to an id");
@@ -66,7 +85,8 @@ GetVolumeIdFromString(const char *volume) {
  */
 
 static unsigned int
-GetPartitionIdFromString(const char *partition) {
+GetPartitionIdFromString(const char *partition)
+{
     unsigned int partition_id;
     char *bad_char = NULL;
     afs_status_t st = 0;
@@ -89,14 +109,14 @@ GetPartitionIdFromString(const char *partition) {
     if (pname_len <= 2) {
        strcat(pname, partition);
     } else if (!strncmp(partition, "/vicep", 6)) {
-       strcat(pname, partition+6);
+       strcat(pname, partition + 6);
     } else if (!strncmp(partition, "vicep", 5)) {
-       strcat(pname, partition+5);
+       strcat(pname, partition + 5);
     } else {
        ERR_EXT("invalid partition");
     }
 
-    if (!vos_PartitionNameToId((const char *) pname, &partition_id, &st)) {
+    if (!vos_PartitionNameToId((const char *)pname, &partition_id, &st)) {
        ERR_ST_EXT("invalid partition", st);
     }
 
@@ -109,8 +129,9 @@ GetPartitionIdFromString(const char *partition) {
  */
 
 static int
-GetAddressFromString(const char *addr_str) {
-    int addr= inet_addr(addr_str);
+GetAddressFromString(const char *addr_str)
+{
+    int addr = inet_addr(addr_str);
 
     if (addr == -1) {
        ERR_EXT("failed to convert specified address");
@@ -120,14 +141,15 @@ GetAddressFromString(const char *addr_str) {
 }
 
 static void
-PrintMessage(vos_messageType_t type, char *message) {
+PrintMessage(vos_messageType_t type, char *message)
+{
     printf("%s\n", message);
 }
 
 int
-DoVosBackupVolumeCreate(struct cmd_syndesc *as, char *arock)
+DoVosBackupVolumeCreate(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {VOLUME} DoVosBackupVolumeCreate_parm_t;
+    typedef enum { VOLUME } DoVosBackupVolumeCreate_parm_t;
     afs_status_t st = 0;
     unsigned int volume_id;
 
@@ -136,20 +158,18 @@ DoVosBackupVolumeCreate(struct cmd_syndesc *as, char *arock)
        volume_id = GetVolumeIdFromString(volume);
     }
 
-    if (!vos_BackupVolumeCreate(cellHandle,
-                               0,
-                               volume_id,
-                               &st)) {
+    if (!vos_BackupVolumeCreate(cellHandle, 0, volume_id, &st)) {
        ERR_ST_EXT("vos_BackupVolumeCreate", st);
     }
     return 0;
 }
 
 int
-DoVosBackupVolumeCreateMultiple(struct cmd_syndesc *as, char *arock)
+DoVosBackupVolumeCreateMultiple(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, PREFIX, EXCLUDE}
-      DoVosBackupVolumeCreate_parm_t;
+    typedef enum { SERVER, PARTITION, PREFIX,
+       EXCLUDE
+    } DoVosBackupVolumeCreate_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -158,16 +178,15 @@ DoVosBackupVolumeCreateMultiple(struct cmd_syndesc *as, char *arock)
     vos_exclude_t exclude = VOS_INCLUDE;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
        part_ptr = &partition_id;
     }
 
@@ -179,13 +198,9 @@ DoVosBackupVolumeCreateMultiple(struct cmd_syndesc *as, char *arock)
        exclude = VOS_EXCLUDE;
     }
 
-    if (!vos_BackupVolumeCreateMultiple(cellHandle,
-                                       vos_server,
-                                       (vos_MessageCallBack_t) 0,
-                                       part_ptr,
-                                       prefix,
-                                       exclude,
-                                       &st)) {
+    if (!vos_BackupVolumeCreateMultiple
+       (cellHandle, vos_server, (vos_MessageCallBack_t) 0, part_ptr, prefix,
+        exclude, &st)) {
        ERR_ST_EXT("vos_BackupVolumeCreate", st);
     }
     return 0;
@@ -202,34 +217,28 @@ Print_vos_partitionEntry_p(vos_partitionEntry_p part, const char *prefix)
 }
 
 int
-DoVosPartitionGet(struct cmd_syndesc *as, char *arock)
+DoVosPartitionGet(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION}
-      DoVosPartitionGet_parm_t;
+    typedef enum { SERVER, PARTITION } DoVosPartitionGet_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
     vos_partitionEntry_t entry;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
-    if (!vos_PartitionGet(cellHandle,
-                         vos_server,
-                         0,
-                         partition_id,
-                         &entry,
-                         &st)) {
+    if (!vos_PartitionGet
+       (cellHandle, vos_server, 0, partition_id, &entry, &st)) {
        ERR_ST_EXT("vos_PartitionGet", st);
     }
 
@@ -239,34 +248,28 @@ DoVosPartitionGet(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosPartitionList(struct cmd_syndesc *as, char *arock)
+DoVosPartitionList(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER}
-      DoVosPartitionGet_parm_t;
+    typedef enum { SERVER } DoVosPartitionGet_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     void *iter;
     vos_partitionEntry_t entry;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
-    if (!vos_PartitionGetBegin(cellHandle,
-                              vos_server,
-                              0,
-                              &iter,
-                              &st)) {
+    if (!vos_PartitionGetBegin(cellHandle, vos_server, 0, &iter, &st)) {
        ERR_ST_EXT("vos_PartitionGetBegin", st);
     }
 
-    printf("Listing partitions at server %s\n", as->parms[SERVER].items->data);
-    while(vos_PartitionGetNext(iter, &entry, &st)) {
+    printf("Listing partitions at server %s\n",
+          as->parms[SERVER].items->data);
+    while (vos_PartitionGetNext(iter, &entry, &st)) {
        Print_vos_partitionEntry_p(&entry, "    ");
     }
 
@@ -274,52 +277,46 @@ DoVosPartitionList(struct cmd_syndesc *as, char *arock)
        ERR_ST_EXT("vos_PartitionGetNext", st);
     }
 
-    if (!vos_PartitionGetDone(iter,
-                             &st)) {
+    if (!vos_PartitionGetDone(iter, &st)) {
        ERR_ST_EXT("vos_PartitionGetDone", st);
     }
     return 0;
 }
 
 int
-DoVosServerSync(struct cmd_syndesc *as, char *arock)
+DoVosServerSync(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION}
-      DoVosServerSync_parm_t;
+    typedef enum { SERVER, PARTITION } DoVosServerSync_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
     const unsigned int *part_ptr = NULL;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
        part_ptr = &partition_id;
     }
 
-    if (!vos_ServerSync(cellHandle,
-                       vos_server,
-                       0,
-                       part_ptr,
-                       &st)) {
+    if (!vos_ServerSync(cellHandle, vos_server, 0, part_ptr, &st)) {
        ERR_ST_EXT("vos_PartitionGetDone", st);
     }
     return 0;
 }
 
 int
-DoVosFileServerAddressChange(struct cmd_syndesc *as, char *arock)
+DoVosFileServerAddressChange(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {OLDADDRESS, NEWADDRESS}
-      DoVosFileServerAddressChange_parm_t;
+    typedef enum { OLDADDRESS,
+       NEWADDRESS
+    } DoVosFileServerAddressChange_parm_t;
     afs_status_t st = 0;
     int old_addr, new_addr;
 
@@ -333,21 +330,16 @@ DoVosFileServerAddressChange(struct cmd_syndesc *as, char *arock)
        new_addr = GetAddressFromString(addr);
     }
 
-    if (!vos_FileServerAddressChange(cellHandle,
-                                    0,
-                                    old_addr,
-                                    new_addr,
-                                    &st)) {
+    if (!vos_FileServerAddressChange(cellHandle, 0, old_addr, new_addr, &st)) {
        ERR_ST_EXT("vos_FileServerAddressChange", st);
     }
     return 0;
 }
 
 int
-DoVosFileServerAddressRemove(struct cmd_syndesc *as, char *arock)
+DoVosFileServerAddressRemove(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {ADDRESS}
-      DoVosFileServerAddressRemove_parm_t;
+    typedef enum { ADDRESS } DoVosFileServerAddressRemove_parm_t;
     afs_status_t st = 0;
     int address;
 
@@ -356,10 +348,7 @@ DoVosFileServerAddressRemove(struct cmd_syndesc *as, char *arock)
        address = GetAddressFromString(addr);
     }
 
-    if (!vos_FileServerAddressRemove(cellHandle,
-                                    0,
-                                    address,
-                                    &st)) {
+    if (!vos_FileServerAddressRemove(cellHandle, 0, address, &st)) {
        ERR_ST_EXT("vos_FileServerAddressRemove", st);
     }
     return 0;
@@ -370,27 +359,24 @@ Print_vos_fileServerEntry_p(vos_fileServerEntry_p serv, const char *prefix)
 {
     int i;
 
-    for(i=0;i<serv->count;i++) {
+    for (i = 0; i < serv->count; i++) {
        printf("%s%x ", prefix, serv->serverAddress[i]);
     }
     printf("\n");
 }
 
 int
-DoVosFileServerList(struct cmd_syndesc *as, char *arock)
+DoVosFileServerList(struct cmd_syndesc *as, void *arock)
 {
     afs_status_t st = 0;
     void *iter;
     vos_fileServerEntry_t entry;
 
-    if (!vos_FileServerGetBegin(cellHandle,
-                               0,
-                               &iter,
-                               &st)) {
+    if (!vos_FileServerGetBegin(cellHandle, 0, &iter, &st)) {
        ERR_ST_EXT("vos_FileServerGetBegin", st);
     }
 
-    while(vos_FileServerGetNext(iter, &entry, &st)) {
+    while (vos_FileServerGetNext(iter, &entry, &st)) {
        Print_vos_fileServerEntry_p(&entry, "");
     }
 
@@ -398,8 +384,7 @@ DoVosFileServerList(struct cmd_syndesc *as, char *arock)
        ERR_ST_EXT("vos_FileServerGetNext", st);
     }
 
-    if (!vos_FileServerGetDone(iter,
-                              &st)) {
+    if (!vos_FileServerGetDone(iter, &st)) {
        ERR_ST_EXT("vos_FileServerGetDone", st);
     }
 
@@ -407,8 +392,8 @@ DoVosFileServerList(struct cmd_syndesc *as, char *arock)
 }
 
 static void
-Print_vos_serverTransactionStatus_p(
-  vos_serverTransactionStatus_p tran, const char *prefix)
+Print_vos_serverTransactionStatus_p(vos_serverTransactionStatus_p tran,
+                                   const char *prefix)
 {
     printf("%sTransaction id\t\t\t%d\n", prefix, tran->transactionId);
     printf("%sLast active time\t\t\t%d\n", prefix, tran->lastActiveTime);
@@ -416,29 +401,25 @@ Print_vos_serverTransactionStatus_p(
     printf("%sError code\t\t\t%d\n", prefix, tran->errorCode);
     printf("%sVolume id\t\t\t\t%u\n", prefix, tran->volumeId);
     printf("%sPartition\t\t\t\t%d\n", prefix, tran->partition);
-    printf("%sLast procedure name\t\t\t%s\n", prefix, tran->lastProcedureName);
-    printf("%sNext receive packet seq num\t\t\t%d\n",
-          prefix,
+    printf("%sLast procedure name\t\t\t%s\n", prefix,
+          tran->lastProcedureName);
+    printf("%sNext receive packet seq num\t\t\t%d\n", prefix,
           tran->nextReceivePacketSequenceNumber);
-    printf("%sNext send packet seq num\t\t\t%d\n",
-          prefix,
+    printf("%sNext send packet seq num\t\t\t%d\n", prefix,
           tran->nextSendPacketSequenceNumber);
     printf("%sLast receive time\t\t\t%d\n", prefix, tran->lastReceiveTime);
     printf("%sLast send time\t\t\t%d\n", prefix, tran->lastSendTime);
     printf("%sVolume attach mode\t\t\t%d\n", prefix, tran->volumeAttachMode);
-    printf("%sVolume active status\t\t\t%d\n",
-           prefix,
+    printf("%sVolume active status\t\t\t%d\n", prefix,
           tran->volumeActiveStatus);
-    printf("%sVolume tran status\t\t\t%d\n",
-          prefix,
+    printf("%sVolume tran status\t\t\t%d\n", prefix,
           tran->volumeTransactionStatus);
 }
 
 int
-DoVosServerTransactionStatusList(struct cmd_syndesc *as, char *arock)
+DoVosServerTransactionStatusList(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER}
-      DoVosServerTransactionStatusList_parm_t;
+    typedef enum { SERVER } DoVosServerTransactionStatusList_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     void *iter = NULL;
@@ -446,23 +427,18 @@ DoVosServerTransactionStatusList(struct cmd_syndesc *as, char *arock)
 
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
-    if (!vos_ServerTransactionStatusGetBegin(cellHandle,
-                                            vos_server,
-                                            0,
-                                            &iter,
-                                            &st)) {
+    if (!vos_ServerTransactionStatusGetBegin
+       (cellHandle, vos_server, 0, &iter, &st)) {
        ERR_ST_EXT("vos_ServerTransactionStatusGetBegin", st);
     }
 
-    while(vos_ServerTransactionStatusGetNext(iter, &tran, &st)) {
+    while (vos_ServerTransactionStatusGetNext(iter, &tran, &st)) {
        Print_vos_serverTransactionStatus_p(&tran, "");
     }
 
@@ -470,33 +446,26 @@ DoVosServerTransactionStatusList(struct cmd_syndesc *as, char *arock)
        ERR_ST_EXT("vos_ServerTransactionStatusGetNext", st);
     }
 
-    if (!vos_ServerTransactionStatusGetDone(iter,
-                                           &st)) {
+    if (!vos_ServerTransactionStatusGetDone(iter, &st)) {
        ERR_ST_EXT("vos_ServerTransactionStatusGetDone", st);
     }
     return 0;
 }
 
 static void
-Print_vos_vldbEntry_p(
-  vos_vldbEntry_p entry, const char *prefix)
+Print_vos_vldbEntry_p(vos_vldbEntry_p entry, const char *prefix)
 {
     int i;
 
     printf("%sVolume entry %s\n", prefix, entry->name);
     printf("%sNumber of servers %d\n", prefix, entry->numServers);
-    printf("%sRead write volume %u\n",
-          prefix,
+    printf("%sRead write volume %u\n", prefix,
           entry->volumeId[VOS_READ_WRITE_VOLUME]);
-    printf("%sRead only volume %u\n",
-          prefix,
+    printf("%sRead only volume %u\n", prefix,
           entry->volumeId[VOS_READ_ONLY_VOLUME]);
-    printf("%sBackup volume %u\n",
-          prefix,
+    printf("%sBackup volume %u\n", prefix,
           entry->volumeId[VOS_BACKUP_VOLUME]);
-    printf("%sClone volume %u\n",
-          prefix,
-          entry->cloneId);
+    printf("%sClone volume %u\n", prefix, entry->cloneId);
 
     printf("%sVolume entry status:\n", prefix);
     if (entry->status & VOS_VLDB_ENTRY_OK) {
@@ -531,12 +500,10 @@ Print_vos_vldbEntry_p(
     }
 
     printf("%sVolume location information for replicas:\n", prefix);
-    for(i=0;i<entry->numServers;i++) {
-       printf("%s\tServer %x\n",
-              prefix,
+    for (i = 0; i < entry->numServers; i++) {
+       printf("%s\tServer %x\n", prefix,
               entry->volumeSites[i].serverAddress);
-       printf("%s\tPartition %x\n",
-              prefix,
+       printf("%s\tPartition %x\n", prefix,
               entry->volumeSites[i].serverPartition);
        if (entry->volumeSites[i].serverFlags & VOS_VLDB_NEW_REPSITE) {
            printf("%s\tVOS_VLDB_NEW_REPSITE\n", prefix);
@@ -558,10 +525,9 @@ Print_vos_vldbEntry_p(
 }
 
 int
-DoVosVLDBGet(struct cmd_syndesc *as, char *arock)
+DoVosVLDBGet(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {VOLUME}
-      DoVosVLDBGet_parm_t;
+    typedef enum { VOLUME } DoVosVLDBGet_parm_t;
     afs_status_t st = 0;
     vos_vldbEntry_t entry;
     unsigned int volume_id;
@@ -573,12 +539,7 @@ DoVosVLDBGet(struct cmd_syndesc *as, char *arock)
     }
 
 
-    if (!vos_VLDBGet(cellHandle,
-                    0,
-                    &volume_id,
-                    volume_name,
-                    &entry,
-                    &st)) {
+    if (!vos_VLDBGet(cellHandle, 0, &volume_id, volume_name, &entry, &st)) {
        ERR_ST_EXT("vos_VLDBGet", st);
     }
 
@@ -588,10 +549,9 @@ DoVosVLDBGet(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVLDBList(struct cmd_syndesc *as, char *arock)
+DoVosVLDBList(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION}
-      DoVosVLDBList_parm_t;
+    typedef enum { SERVER, PARTITION } DoVosVLDBList_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -601,10 +561,8 @@ DoVosVLDBList(struct cmd_syndesc *as, char *arock)
     void *iter = NULL;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
        have_server = 1;
@@ -614,20 +572,16 @@ DoVosVLDBList(struct cmd_syndesc *as, char *arock)
        if (!have_server) {
            ERR_EXT("must specify server when specifying partition");
        }
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
        part_ptr = &partition_id;
     }
 
-    if (!vos_VLDBGetBegin(cellHandle,
-                         vos_server,
-                         0,
-                         part_ptr,
-                         &iter,
-                         &st)) {
+    if (!vos_VLDBGetBegin(cellHandle, vos_server, 0, part_ptr, &iter, &st)) {
        ERR_ST_EXT("vos_VLDBGetBegin", st);
     }
 
-    while(vos_VLDBGetNext(iter, &entry, &st)) {
+    while (vos_VLDBGetNext(iter, &entry, &st)) {
        Print_vos_vldbEntry_p(&entry, "");
     }
 
@@ -635,8 +589,7 @@ DoVosVLDBList(struct cmd_syndesc *as, char *arock)
        ERR_ST_EXT("vos_VLDBGetNext", st);
     }
 
-    if (!vos_VLDBGetDone(iter,
-                        &st)) {
+    if (!vos_VLDBGetDone(iter, &st)) {
        ERR_ST_EXT("vos_VLDBGetDone", st);
     }
 
@@ -644,10 +597,9 @@ DoVosVLDBList(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVLDBEntryRemove(struct cmd_syndesc *as, char *arock)
+DoVosVLDBEntryRemove(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, VOLUME}
-      DoVosVLDBEntryRemove_parm_t;
+    typedef enum { SERVER, PARTITION, VOLUME } DoVosVLDBEntryRemove_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -657,10 +609,8 @@ DoVosVLDBEntryRemove(struct cmd_syndesc *as, char *arock)
     unsigned int *vol_ptr = NULL;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
        have_server = 1;
@@ -670,7 +620,8 @@ DoVosVLDBEntryRemove(struct cmd_syndesc *as, char *arock)
        if (!have_server) {
            ERR_EXT("must specify server when specifying partition");
        }
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
        part_ptr = &partition_id;
     }
 
@@ -680,12 +631,8 @@ DoVosVLDBEntryRemove(struct cmd_syndesc *as, char *arock)
        vol_ptr = &volume_id;
     }
 
-    if (!vos_VLDBEntryRemove(cellHandle,
-                            vos_server,
-                            0,
-                            part_ptr,
-                            vol_ptr,
-                            &st)) {
+    if (!vos_VLDBEntryRemove
+       (cellHandle, vos_server, 0, part_ptr, vol_ptr, &st)) {
        ERR_ST_EXT("vos_VLDBEntryRemove", st);
     }
 
@@ -693,10 +640,9 @@ DoVosVLDBEntryRemove(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVLDBUnlock(struct cmd_syndesc *as, char *arock)
+DoVosVLDBUnlock(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION}
-      DoVosVLDBUnlock_parm_t;
+    typedef enum { SERVER, PARTITION } DoVosVLDBUnlock_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -704,10 +650,8 @@ DoVosVLDBUnlock(struct cmd_syndesc *as, char *arock)
     int have_server = 0;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
        have_server = 1;
@@ -717,15 +661,12 @@ DoVosVLDBUnlock(struct cmd_syndesc *as, char *arock)
        if (!have_server) {
            ERR_EXT("must specify server when specifying partition");
        }
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
        part_ptr = &partition_id;
     }
 
-    if (!vos_VLDBUnlock(cellHandle,
-                       vos_server,
-                       0,
-                       part_ptr,
-                       &st)) {
+    if (!vos_VLDBUnlock(cellHandle, vos_server, 0, part_ptr, &st)) {
        ERR_ST_EXT("vos_VLDBUnlock", st);
     }
 
@@ -733,10 +674,9 @@ DoVosVLDBUnlock(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVLDBEntryLock(struct cmd_syndesc *as, char *arock)
+DoVosVLDBEntryLock(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {VOLUME}
-      DoVosVLDBEntryLoc_parm_tk;
+    typedef enum { VOLUME } DoVosVLDBEntryLoc_parm_tk;
     afs_status_t st = 0;
     unsigned int volume_id;
 
@@ -745,10 +685,7 @@ DoVosVLDBEntryLock(struct cmd_syndesc *as, char *arock)
        volume_id = GetVolumeIdFromString(volume);
     }
 
-    if (!vos_VLDBEntryLock(cellHandle,
-                          0,
-                          volume_id,
-                          &st)) {
+    if (!vos_VLDBEntryLock(cellHandle, 0, volume_id, &st)) {
        ERR_ST_EXT("vos_VLDBEntryLock", st);
     }
 
@@ -756,10 +693,9 @@ DoVosVLDBEntryLock(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVLDBEntryUnlock(struct cmd_syndesc *as, char *arock)
+DoVosVLDBEntryUnlock(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {VOLUME}
-      DoVosVLDBEntryUnlock_parm_t;
+    typedef enum { VOLUME } DoVosVLDBEntryUnlock_parm_t;
     afs_status_t st = 0;
     unsigned int volume_id;
 
@@ -768,10 +704,7 @@ DoVosVLDBEntryUnlock(struct cmd_syndesc *as, char *arock)
        volume_id = GetVolumeIdFromString(volume);
     }
 
-    if (!vos_VLDBEntryUnlock(cellHandle,
-                            0,
-                            volume_id,
-                            &st)) {
+    if (!vos_VLDBEntryUnlock(cellHandle, 0, volume_id, &st)) {
        ERR_ST_EXT("vos_VLDBEntryUnlock", st);
     }
 
@@ -779,26 +712,26 @@ DoVosVLDBEntryUnlock(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVLDBReadOnlySiteCreate(struct cmd_syndesc *as, char *arock)
+DoVosVLDBReadOnlySiteCreate(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, VOLUME}
-      DoVosVLDBReadOnlySiteCreate_parm_t;
+    typedef enum { SERVER, PARTITION,
+       VOLUME
+    } DoVosVLDBReadOnlySiteCreate_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
     unsigned int volume_id;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
     if (as->parms[VOLUME].items) {
@@ -806,38 +739,34 @@ DoVosVLDBReadOnlySiteCreate(struct cmd_syndesc *as, char *arock)
        volume_id = GetVolumeIdFromString(volume);
     }
 
-    if (!vos_VLDBReadOnlySiteCreate(cellHandle,
-                                   vos_server,
-                                   0,
-                                   partition_id,
-                                   volume_id,
-                                   &st)) {
+    if (!vos_VLDBReadOnlySiteCreate
+       (cellHandle, vos_server, 0, partition_id, volume_id, &st)) {
        ERR_ST_EXT("vos_VLDBReadOnlySiteCreate", st);
     }
     return 0;
 }
 
 int
-DoVosVLDBReadOnlySiteDelete(struct cmd_syndesc *as, char *arock)
+DoVosVLDBReadOnlySiteDelete(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, VOLUME}
-      DoVosVLDBReadOnlySiteDelete_parm_t;
+    typedef enum { SERVER, PARTITION,
+       VOLUME
+    } DoVosVLDBReadOnlySiteDelete_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
     unsigned int volume_id;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
     if (as->parms[VOLUME].items) {
@@ -845,12 +774,8 @@ DoVosVLDBReadOnlySiteDelete(struct cmd_syndesc *as, char *arock)
        volume_id = GetVolumeIdFromString(volume);
     }
 
-    if (!vos_VLDBReadOnlySiteDelete(cellHandle,
-                                   vos_server,
-                                   0,
-                                   partition_id,
-                                   volume_id,
-                                   &st)) {
+    if (!vos_VLDBReadOnlySiteDelete
+       (cellHandle, vos_server, 0, partition_id, volume_id, &st)) {
        ERR_ST_EXT("vos_VLDBReadOnlySiteDelete", st);
     }
 
@@ -858,10 +783,9 @@ DoVosVLDBReadOnlySiteDelete(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVLDBSync(struct cmd_syndesc *as, char *arock)
+DoVosVLDBSync(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, FORCE}
-      DoVosVLDBSync_parm_t;
+    typedef enum { SERVER, PARTITION, FORCE } DoVosVLDBSync_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -870,10 +794,8 @@ DoVosVLDBSync(struct cmd_syndesc *as, char *arock)
     vos_force_t force = VOS_NORMAL;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
        have_server = 1;
@@ -883,7 +805,8 @@ DoVosVLDBSync(struct cmd_syndesc *as, char *arock)
        if (!have_server) {
            ERR_EXT("must specify server when specifying partition");
        }
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
        part_ptr = &partition_id;
     }
 
@@ -891,12 +814,7 @@ DoVosVLDBSync(struct cmd_syndesc *as, char *arock)
        force = VOS_FORCE;
     }
 
-    if (!vos_VLDBSync(cellHandle,
-                     vos_server,
-                     0,
-                     part_ptr,
-                     force,
-                     &st)) {
+    if (!vos_VLDBSync(cellHandle, vos_server, 0, part_ptr, force, &st)) {
        ERR_ST_EXT("vos_VLDBSync", st);
     }
 
@@ -904,10 +822,11 @@ DoVosVLDBSync(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVolumeCreate(struct cmd_syndesc *as, char *arock)
+DoVosVolumeCreate(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, VOLUME, QUOTA}
-      DoVosVolumeCreate_parm_t;
+    typedef enum { SERVER, PARTITION, VOLUME,
+       QUOTA
+    } DoVosVolumeCreate_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -916,16 +835,15 @@ DoVosVolumeCreate(struct cmd_syndesc *as, char *arock)
     unsigned int quota;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
     if (as->parms[VOLUME].items) {
@@ -933,18 +851,13 @@ DoVosVolumeCreate(struct cmd_syndesc *as, char *arock)
     }
 
     if (as->parms[QUOTA].items) {
-       quota = GetIntFromString(as->parms[QUOTA].items->data,
-                                "invalid quota");
-    }
-
-    if (!vos_VolumeCreate(cellHandle,
-                         vos_server,
-                         0,
-                         partition_id,
-                         volume,
-                         quota,
-                         &volume_id,
-                         &st)) {
+       quota =
+           GetIntFromString(as->parms[QUOTA].items->data, "invalid quota");
+    }
+
+    if (!vos_VolumeCreate
+       (cellHandle, vos_server, 0, partition_id, volume, quota, &volume_id,
+        &st)) {
        ERR_ST_EXT("vos_VolumeCreate", st);
     }
 
@@ -954,26 +867,24 @@ DoVosVolumeCreate(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVolumeDelete(struct cmd_syndesc *as, char *arock)
+DoVosVolumeDelete(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, VOLUME}
-      DoVosVolumeDelete_parm_t;
+    typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeDelete_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
     unsigned int volume_id;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
     if (as->parms[VOLUME].items) {
@@ -981,12 +892,8 @@ DoVosVolumeDelete(struct cmd_syndesc *as, char *arock)
        volume_id = GetVolumeIdFromString(volume);
     }
 
-    if (!vos_VolumeDelete(cellHandle,
-                         vos_server,
-                         0,
-                         partition_id,
-                         volume_id,
-                         &st)) {
+    if (!vos_VolumeDelete
+       (cellHandle, vos_server, 0, partition_id, volume_id, &st)) {
        ERR_ST_EXT("vos_VolumeDelete", st);
     }
 
@@ -994,10 +901,9 @@ DoVosVolumeDelete(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVolumeRename(struct cmd_syndesc *as, char *arock)
+DoVosVolumeRename(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {OLDVOLUME, NEWVOLUME}
-      DoVosVolumeRename_parm_t;
+    typedef enum { OLDVOLUME, NEWVOLUME } DoVosVolumeRename_parm_t;
     afs_status_t st = 0;
     unsigned int old_volume;
     const char *new_volume;
@@ -1011,11 +917,7 @@ DoVosVolumeRename(struct cmd_syndesc *as, char *arock)
        new_volume = as->parms[NEWVOLUME].items->data;
     }
 
-    if (!vos_VolumeRename(cellHandle,
-                         0,
-                         old_volume,
-                         new_volume,
-                         &st)) {
+    if (!vos_VolumeRename(cellHandle, 0, old_volume, new_volume, &st)) {
        ERR_ST_EXT("vos_VolumeRename", st);
     }
 
@@ -1023,10 +925,11 @@ DoVosVolumeRename(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVolumeDump(struct cmd_syndesc *as, char *arock)
+DoVosVolumeDump(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, VOLUME, STARTTIME, DUMPFILE}
-      DoVosVolumeDump_parm_t;
+    typedef enum { SERVER, PARTITION, VOLUME, STARTTIME,
+       DUMPFILE
+    } DoVosVolumeDump_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -1037,10 +940,8 @@ DoVosVolumeDump(struct cmd_syndesc *as, char *arock)
     const char *dumpfile;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
        have_server = 1;
@@ -1050,7 +951,8 @@ DoVosVolumeDump(struct cmd_syndesc *as, char *arock)
        if (!have_server) {
            ERR_EXT("must specify server when specifying partition");
        }
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
        part_ptr = &partition_id;
     }
 
@@ -1060,22 +962,18 @@ DoVosVolumeDump(struct cmd_syndesc *as, char *arock)
     }
 
     if (as->parms[STARTTIME].items) {
-       start_time = GetIntFromString(as->parms[STARTTIME].items->data,
-                                     "invalid start time");
+       start_time =
+           GetIntFromString(as->parms[STARTTIME].items->data,
+                            "invalid start time");
     }
 
     if (as->parms[DUMPFILE].items) {
        dumpfile = as->parms[DUMPFILE].items->data;
     }
 
-    if (!vos_VolumeDump(cellHandle,
-                       vos_server,
-                       0,
-                       part_ptr,
-                       volume_id,
-                       start_time,
-                       dumpfile,
-                       &st)) {
+    if (!vos_VolumeDump
+       (cellHandle, vos_server, 0, part_ptr, volume_id, start_time, dumpfile,
+        &st)) {
        ERR_ST_EXT("vos_VolumeDump", st);
     }
 
@@ -1083,10 +981,11 @@ DoVosVolumeDump(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVolumeRestore(struct cmd_syndesc *as, char *arock)
+DoVosVolumeRestore(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, ID, VOLUME, DUMPFILE, FULL}
-      DoVosVolumeRestore_parm_t;
+    typedef enum { SERVER, PARTITION, ID, VOLUME, DUMPFILE,
+       FULL
+    } DoVosVolumeRestore_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -1097,16 +996,15 @@ DoVosVolumeRestore(struct cmd_syndesc *as, char *arock)
     vos_volumeRestoreType_t restore = VOS_RESTORE_INCREMENTAL;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
     if (as->parms[VOLUME].items) {
@@ -1127,15 +1025,9 @@ DoVosVolumeRestore(struct cmd_syndesc *as, char *arock)
        restore = VOS_RESTORE_FULL;
     }
 
-    if (!vos_VolumeRestore(cellHandle,
-                          vos_server,
-                          0,
-                          partition_id,
-                          vol_ptr,
-                          volume_name,
-                          dumpfile,
-                          restore,
-                          &st)) {
+    if (!vos_VolumeRestore
+       (cellHandle, vos_server, 0, partition_id, vol_ptr, volume_name,
+        dumpfile, restore, &st)) {
        ERR_ST_EXT("vos_VolumeRestore", st);
     }
 
@@ -1143,10 +1035,11 @@ DoVosVolumeRestore(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVolumeOnline(struct cmd_syndesc *as, char *arock)
+DoVosVolumeOnline(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, VOLUME, SLEEP, BUSY}
-      DoVosVolumeOnline_parm_t;
+    typedef enum { SERVER, PARTITION, VOLUME, SLEEP,
+       BUSY
+    } DoVosVolumeOnline_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -1155,16 +1048,15 @@ DoVosVolumeOnline(struct cmd_syndesc *as, char *arock)
     vos_volumeOnlineType_t type = VOS_ONLINE_OFFLINE;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
     if (as->parms[VOLUME].items) {
@@ -1173,21 +1065,17 @@ DoVosVolumeOnline(struct cmd_syndesc *as, char *arock)
     }
 
     if (as->parms[SLEEP].items) {
-       sleep = GetIntFromString(as->parms[SLEEP].items->data,
-                                "invalid sleep time");
+       sleep =
+           GetIntFromString(as->parms[SLEEP].items->data,
+                            "invalid sleep time");
     }
 
     if (as->parms[BUSY].items) {
        type = VOS_ONLINE_BUSY;
     }
 
-    if (!vos_VolumeOnline(vos_server,
-                         0,
-                         partition_id,
-                         volume_id,
-                         sleep,
-                         type,
-                         &st)) {
+    if (!vos_VolumeOnline
+       (vos_server, 0, partition_id, volume_id, sleep, type, &st)) {
        ERR_ST_EXT("vos_VolumeOnline", st);
     }
 
@@ -1195,26 +1083,24 @@ DoVosVolumeOnline(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVolumeOffline(struct cmd_syndesc *as, char *arock)
+DoVosVolumeOffline(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, VOLUME}
-      DoVosVolumeOffline_parm_t;
+    typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeOffline_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
     unsigned int volume_id;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
     if (as->parms[VOLUME].items) {
@@ -1222,11 +1108,7 @@ DoVosVolumeOffline(struct cmd_syndesc *as, char *arock)
        volume_id = GetVolumeIdFromString(volume);
     }
 
-    if (!vos_VolumeOffline(vos_server,
-                          0,
-                          partition_id,
-                          volume_id,
-                          &st)) {
+    if (!vos_VolumeOffline(vos_server, 0, partition_id, volume_id, &st)) {
        ERR_ST_EXT("vos_VolumeOffline", st);
     }
 
@@ -1234,8 +1116,7 @@ DoVosVolumeOffline(struct cmd_syndesc *as, char *arock)
 }
 
 static void
-Print_vos_volumeEntry_p(
-  vos_volumeEntry_p entry, const char *prefix)
+Print_vos_volumeEntry_p(vos_volumeEntry_p entry, const char *prefix)
 {
     if (entry->status == VOS_OK) {
        printf("%sVolume name %s id %u\n", prefix, entry->name, entry->id);
@@ -1246,9 +1127,9 @@ Print_vos_volumeEntry_p(
        printf("%sLast access date %lu\n", prefix, entry->lastAccessDate);
        printf("%sLast update date %lu\n", prefix, entry->lastUpdateDate);
        printf("%sLast backup date %lu\n", prefix, entry->lastBackupDate);
-       printf("%sLast copy creation date %lu\n", prefix, entry->copyCreationDate);
-       printf("%sAccesses since midnight %d\n",
-              prefix,
+       printf("%sLast copy creation date %lu\n", prefix,
+              entry->copyCreationDate);
+       printf("%sAccesses since midnight %d\n", prefix,
               entry->accessesSinceMidnight);
        printf("%sFile count %d\n", prefix, entry->fileCount);
        printf("%sMax quota %d\n", prefix, entry->maxQuota);
@@ -1258,7 +1139,7 @@ Print_vos_volumeEntry_p(
 
        printf("%sVolume disposition:\n", prefix);
 
-       switch(entry->volumeDisposition) {
+       switch (entry->volumeDisposition) {
        case VOS_OK:
            printf("%s\tVOS_OK\n", prefix);
            break;
@@ -1296,7 +1177,8 @@ Print_vos_volumeEntry_p(
            printf("%s\tVOS_MOVED\n", prefix);
            break;
        default:
-           printf("Unknown volume disposition %d\n", entry->volumeDisposition);
+           printf("Unknown volume disposition %d\n",
+                  entry->volumeDisposition);
            break;
        }
 
@@ -1313,55 +1195,110 @@ Print_vos_volumeEntry_p(
        printf("\n%s\tSame Network\tSame Network Authenticated"
               "\tDifferent Network\tDifferent Network Authenticated\n\n",
               prefix);
-       printf("%sRead\t%d\t%d\t%d\t%d\n",
-              prefix,
+       printf("%sRead\t%d\t%d\t%d\t%d\n", prefix,
               entry->readStats[VOS_VOLUME_READ_WRITE_STATS_SAME_NETWORK],
-              entry->readStats[VOS_VOLUME_READ_WRITE_STATS_SAME_NETWORK_AUTHENTICATED],
-              entry->readStats[VOS_VOLUME_READ_WRITE_STATS_DIFFERENT_NETWORK],
-              entry->readStats[VOS_VOLUME_READ_WRITE_STATS_DIFFERENT_NETWORK_AUTHENTICATED]);
-       printf("%sWrite\t%d\t%d\t%d\t%d\n",
-              prefix,
+              entry->
+              readStats
+              [VOS_VOLUME_READ_WRITE_STATS_SAME_NETWORK_AUTHENTICATED],
+              entry->
+              readStats[VOS_VOLUME_READ_WRITE_STATS_DIFFERENT_NETWORK],
+              entry->
+              readStats
+              [VOS_VOLUME_READ_WRITE_STATS_DIFFERENT_NETWORK_AUTHENTICATED]);
+       printf("%sWrite\t%d\t%d\t%d\t%d\n", prefix,
               entry->writeStats[VOS_VOLUME_READ_WRITE_STATS_SAME_NETWORK],
-              entry->writeStats[VOS_VOLUME_READ_WRITE_STATS_SAME_NETWORK_AUTHENTICATED],
-              entry->writeStats[VOS_VOLUME_READ_WRITE_STATS_DIFFERENT_NETWORK],
-              entry->writeStats[VOS_VOLUME_READ_WRITE_STATS_DIFFERENT_NETWORK_AUTHENTICATED]);
-
-       printf("\n%s\t0 to 60 secs\t1 to 10 mins\t10 to 60 mins\t1 to 24 hrs\t1 to 7 days\t more than 7 days\n", prefix);
+              entry->
+              writeStats
+              [VOS_VOLUME_READ_WRITE_STATS_SAME_NETWORK_AUTHENTICATED],
+              entry->
+              writeStats[VOS_VOLUME_READ_WRITE_STATS_DIFFERENT_NETWORK],
+              entry->
+              writeStats
+              [VOS_VOLUME_READ_WRITE_STATS_DIFFERENT_NETWORK_AUTHENTICATED]);
+
+       printf
+           ("\n%s\t0 to 60 secs\t1 to 10 mins\t10 to 60 mins\t1 to 24 hrs\t1 to 7 days\t more than 7 days\n",
+            prefix);
        printf("%sFile Author Write Same Network\t%d\t%d\t%d\t%d\t%d\t%d\n",
               prefix,
-              entry->fileAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_0_TO_60_SECONDS],
-              entry->fileAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_1_TO_10_MINUTES],
-              entry->fileAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_10_TO_60_MINUTES],
-              entry->fileAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_1_TO_24_HOURS],
-              entry->fileAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_1_TO_7_DAYS],
-              entry->fileAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_GREATER_THAN_7_DAYS]);
+              entry->
+              fileAuthorWriteSameNetwork
+              [VOS_VOLUME_TIME_STATS_0_TO_60_SECONDS],
+              entry->
+              fileAuthorWriteSameNetwork
+              [VOS_VOLUME_TIME_STATS_1_TO_10_MINUTES],
+              entry->
+              fileAuthorWriteSameNetwork
+              [VOS_VOLUME_TIME_STATS_10_TO_60_MINUTES],
+              entry->
+              fileAuthorWriteSameNetwork
+              [VOS_VOLUME_TIME_STATS_1_TO_24_HOURS],
+              entry->
+              fileAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_1_TO_7_DAYS],
+              entry->
+              fileAuthorWriteSameNetwork
+              [VOS_VOLUME_TIME_STATS_GREATER_THAN_7_DAYS]);
        printf("%sFile Author Write Diff Network\t%d\t%d\t%d\t%d\t%d\t%d\n",
               prefix,
-              entry->fileAuthorWriteDifferentNetwork[VOS_VOLUME_TIME_STATS_0_TO_60_SECONDS],
-              entry->fileAuthorWriteDifferentNetwork[VOS_VOLUME_TIME_STATS_1_TO_10_MINUTES],
-              entry->fileAuthorWriteDifferentNetwork[VOS_VOLUME_TIME_STATS_10_TO_60_MINUTES],
-              entry->fileAuthorWriteDifferentNetwork[VOS_VOLUME_TIME_STATS_1_TO_24_HOURS],
-              entry->fileAuthorWriteDifferentNetwork[VOS_VOLUME_TIME_STATS_1_TO_7_DAYS],
-              entry->fileAuthorWriteDifferentNetwork[VOS_VOLUME_TIME_STATS_GREATER_THAN_7_DAYS]);
+              entry->
+              fileAuthorWriteDifferentNetwork
+              [VOS_VOLUME_TIME_STATS_0_TO_60_SECONDS],
+              entry->
+              fileAuthorWriteDifferentNetwork
+              [VOS_VOLUME_TIME_STATS_1_TO_10_MINUTES],
+              entry->
+              fileAuthorWriteDifferentNetwork
+              [VOS_VOLUME_TIME_STATS_10_TO_60_MINUTES],
+              entry->
+              fileAuthorWriteDifferentNetwork
+              [VOS_VOLUME_TIME_STATS_1_TO_24_HOURS],
+              entry->
+              fileAuthorWriteDifferentNetwork
+              [VOS_VOLUME_TIME_STATS_1_TO_7_DAYS],
+              entry->
+              fileAuthorWriteDifferentNetwork
+              [VOS_VOLUME_TIME_STATS_GREATER_THAN_7_DAYS]);
        printf("%sDir Author Write Same Network\t%d\t%d\t%d\t%d\t%d\t%d\n",
               prefix,
-              entry->dirAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_0_TO_60_SECONDS],
-              entry->dirAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_1_TO_10_MINUTES],
-              entry->dirAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_10_TO_60_MINUTES],
-              entry->dirAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_1_TO_24_HOURS],
-              entry->dirAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_1_TO_7_DAYS],
-              entry->dirAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_GREATER_THAN_7_DAYS]);
+              entry->
+              dirAuthorWriteSameNetwork
+              [VOS_VOLUME_TIME_STATS_0_TO_60_SECONDS],
+              entry->
+              dirAuthorWriteSameNetwork
+              [VOS_VOLUME_TIME_STATS_1_TO_10_MINUTES],
+              entry->
+              dirAuthorWriteSameNetwork
+              [VOS_VOLUME_TIME_STATS_10_TO_60_MINUTES],
+              entry->
+              dirAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_1_TO_24_HOURS],
+              entry->
+              dirAuthorWriteSameNetwork[VOS_VOLUME_TIME_STATS_1_TO_7_DAYS],
+              entry->
+              dirAuthorWriteSameNetwork
+              [VOS_VOLUME_TIME_STATS_GREATER_THAN_7_DAYS]);
        printf("%sDir Author Write Diff Network\t%d\t%d\t%d\t%d\t%d\t%d\n",
               prefix,
-              entry->dirAuthorWriteDifferentNetwork[VOS_VOLUME_TIME_STATS_0_TO_60_SECONDS],
-              entry->dirAuthorWriteDifferentNetwork[VOS_VOLUME_TIME_STATS_1_TO_10_MINUTES],
-              entry->dirAuthorWriteDifferentNetwork[VOS_VOLUME_TIME_STATS_10_TO_60_MINUTES],
-              entry->dirAuthorWriteDifferentNetwork[VOS_VOLUME_TIME_STATS_1_TO_24_HOURS],
-              entry->dirAuthorWriteDifferentNetwork[VOS_VOLUME_TIME_STATS_1_TO_7_DAYS],
-              entry->dirAuthorWriteDifferentNetwork[VOS_VOLUME_TIME_STATS_GREATER_THAN_7_DAYS]);
+              entry->
+              dirAuthorWriteDifferentNetwork
+              [VOS_VOLUME_TIME_STATS_0_TO_60_SECONDS],
+              entry->
+              dirAuthorWriteDifferentNetwork
+              [VOS_VOLUME_TIME_STATS_1_TO_10_MINUTES],
+              entry->
+              dirAuthorWriteDifferentNetwork
+              [VOS_VOLUME_TIME_STATS_10_TO_60_MINUTES],
+              entry->
+              dirAuthorWriteDifferentNetwork
+              [VOS_VOLUME_TIME_STATS_1_TO_24_HOURS],
+              entry->
+              dirAuthorWriteDifferentNetwork
+              [VOS_VOLUME_TIME_STATS_1_TO_7_DAYS],
+              entry->
+              dirAuthorWriteDifferentNetwork
+              [VOS_VOLUME_TIME_STATS_GREATER_THAN_7_DAYS]);
     } else {
        printf("%sUnable to print volume because volume status:\n", prefix);
-       switch(entry->status) {
+       switch (entry->status) {
        case VOS_SALVAGE:
            printf("%s\tVOS_SALVAGE\n", prefix);
            break;
@@ -1403,10 +1340,9 @@ Print_vos_volumeEntry_p(
 }
 
 int
-DoVosVolumeGet(struct cmd_syndesc *as, char *arock)
+DoVosVolumeGet(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, VOLUME}
-      DoVosVolumeGet_parm_t;
+    typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeGet_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -1414,16 +1350,15 @@ DoVosVolumeGet(struct cmd_syndesc *as, char *arock)
     vos_volumeEntry_t entry;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
     if (as->parms[VOLUME].items) {
@@ -1431,13 +1366,8 @@ DoVosVolumeGet(struct cmd_syndesc *as, char *arock)
        volume_id = GetVolumeIdFromString(volume);
     }
 
-    if (!vos_VolumeGet(cellHandle,
-                      vos_server,
-                      0,
-                      partition_id,
-                      volume_id,
-                      &entry,
-                      &st)) {
+    if (!vos_VolumeGet
+       (cellHandle, vos_server, 0, partition_id, volume_id, &entry, &st)) {
        ERR_ST_EXT("vos_VolumeGet", st);
     }
 
@@ -1447,10 +1377,9 @@ DoVosVolumeGet(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVolumeList(struct cmd_syndesc *as, char *arock)
+DoVosVolumeList(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION}
-      DoVosVolumeList_parm_t;
+    typedef enum { SERVER, PARTITION } DoVosVolumeList_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     void *iter = NULL;
@@ -1458,32 +1387,26 @@ DoVosVolumeList(struct cmd_syndesc *as, char *arock)
     vos_volumeEntry_t entry;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
-    if (!vos_VolumeGetBegin(cellHandle,
-                           vos_server,
-                           0,
-                           partition_id,
-                           &iter,
-                           &st)) {
+    if (!vos_VolumeGetBegin
+       (cellHandle, vos_server, 0, partition_id, &iter, &st)) {
        ERR_ST_EXT("vos_VolumeGetBegin", st);
     }
 
     printf("Volumes located at %s partition %s\n",
-          as->parms[SERVER].items->data,
-          as->parms[PARTITION].items->data);
+          as->parms[SERVER].items->data, as->parms[PARTITION].items->data);
 
-    while(vos_VolumeGetNext(iter, &entry, &st)) {
+    while (vos_VolumeGetNext(iter, &entry, &st)) {
        Print_vos_volumeEntry_p(&entry, "    ");
        printf("\n");
     }
@@ -1492,8 +1415,7 @@ DoVosVolumeList(struct cmd_syndesc *as, char *arock)
        ERR_ST_EXT("vos_VolumeGetNext", st);
     }
 
-    if (!vos_VolumeGetDone(iter,
-                          &st)) {
+    if (!vos_VolumeGetDone(iter, &st)) {
        ERR_ST_EXT("vos_VolumeGetDone", st);
     }
 
@@ -1501,10 +1423,11 @@ DoVosVolumeList(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVolumeMove(struct cmd_syndesc *as, char *arock)
+DoVosVolumeMove(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {VOLUME, FROMSERVER, FROMPARTITION, TOSERVER, TOPARTITION}
-      DoVosVolumeMove_parm_t;
+    typedef enum { VOLUME, FROMSERVER, FROMPARTITION, TOSERVER,
+       TOPARTITION
+    } DoVosVolumeMove_parm_t;
     afs_status_t st = 0;
     void *from_server = NULL;
     void *to_server = NULL;
@@ -1513,29 +1436,28 @@ DoVosVolumeMove(struct cmd_syndesc *as, char *arock)
     unsigned int volume_id;
 
     if (as->parms[FROMSERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[FROMSERVER].items->data,
-                           &from_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[FROMSERVER].items->data, &from_server,
+            &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[TOSERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[TOSERVER].items->data,
-                           &to_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[TOSERVER].items->data, &to_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[FROMPARTITION].items) {
-       from_partition = GetPartitionIdFromString(as->parms[FROMPARTITION].items->data);
+       from_partition =
+           GetPartitionIdFromString(as->parms[FROMPARTITION].items->data);
     }
 
     if (as->parms[TOPARTITION].items) {
-       to_partition = GetPartitionIdFromString(as->parms[TOPARTITION].items->data);
+       to_partition =
+           GetPartitionIdFromString(as->parms[TOPARTITION].items->data);
     }
 
     if (as->parms[VOLUME].items) {
@@ -1543,14 +1465,9 @@ DoVosVolumeMove(struct cmd_syndesc *as, char *arock)
        volume_id = GetVolumeIdFromString(volume);
     }
 
-    if (!vos_VolumeMove(cellHandle,
-                       0,
-                       volume_id,
-                       from_server,
-                       from_partition,
-                       to_server,
-                       to_partition,
-                       &st)) {
+    if (!vos_VolumeMove
+       (cellHandle, 0, volume_id, from_server, from_partition, to_server,
+        to_partition, &st)) {
        ERR_ST_EXT("vos_VolumeMove", st);
     }
 
@@ -1558,10 +1475,9 @@ DoVosVolumeMove(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosVolumeRelease(struct cmd_syndesc *as, char *arock)
+DoVosVolumeRelease(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {VOLUME, FORCE}
-      DoVosVolumeRelease_parm_t;
+    typedef enum { VOLUME, FORCE } DoVosVolumeRelease_parm_t;
     afs_status_t st = 0;
     unsigned int volume_id;
     vos_force_t force = VOS_NORMAL;
@@ -1575,21 +1491,16 @@ DoVosVolumeRelease(struct cmd_syndesc *as, char *arock)
        force = VOS_FORCE;
     }
 
-    if (!vos_VolumeRelease(cellHandle,
-                          0,
-                          volume_id,
-                          force,
-                          &st)) {
+    if (!vos_VolumeRelease(cellHandle, 0, volume_id, force, &st)) {
        ERR_ST_EXT("vos_VolumeRelease", st);
     }
     return 0;
 }
 
 int
-DoVosVolumeZap(struct cmd_syndesc *as, char *arock)
+DoVosVolumeZap(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, VOLUME, FORCE}
-      DoVosVolumeZap_parm_t;
+    typedef enum { SERVER, PARTITION, VOLUME, FORCE } DoVosVolumeZap_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -1597,16 +1508,15 @@ DoVosVolumeZap(struct cmd_syndesc *as, char *arock)
     vos_force_t force = VOS_NORMAL;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
     if (as->parms[VOLUME].items) {
@@ -1618,13 +1528,8 @@ DoVosVolumeZap(struct cmd_syndesc *as, char *arock)
        force = VOS_FORCE;
     }
 
-    if (!vos_VolumeZap(cellHandle,
-                      vos_server,
-                      0,
-                      partition_id,
-                      volume_id,
-                      force,
-                      &st)) {
+    if (!vos_VolumeZap
+       (cellHandle, vos_server, 0, partition_id, volume_id, force, &st)) {
        ERR_ST_EXT("vos_VolumeZap", st);
     }
 
@@ -1632,54 +1537,52 @@ DoVosVolumeZap(struct cmd_syndesc *as, char *arock)
 }
 
 int
-DoVosPartitionNameToId(struct cmd_syndesc *as, char *arock)
+DoVosPartitionNameToId(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {PARTITION}
-      DoVosPartitionNameToId_parm_t;
+    typedef enum { PARTITION } DoVosPartitionNameToId_parm_t;
     afs_status_t st = 0;
     unsigned int partition_id;
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
     printf("The id for partition %s is %u\n",
-          as->parms[PARTITION].items->data,
-          partition_id);
+          as->parms[PARTITION].items->data, partition_id);
 
     return 0;
 }
 
 int
-DoVosPartitionIdToName(struct cmd_syndesc *as, char *arock)
+DoVosPartitionIdToName(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {PARTITIONID}
-      DoVosPartitionIdToName_parm_t;
+    typedef enum { PARTITIONID } DoVosPartitionIdToName_parm_t;
     afs_status_t st = 0;
     unsigned int partition_id;
     char partition[VOS_MAX_PARTITION_NAME_LEN];
 
     if (as->parms[PARTITIONID].items) {
-       partition_id = GetIntFromString(as->parms[PARTITIONID].items->data,
-                                       "bad partition id");
+       partition_id =
+           GetIntFromString(as->parms[PARTITIONID].items->data,
+                            "bad partition id");
     }
 
     if (!vos_PartitionIdToName(partition_id, partition, &st)) {
        ERR_ST_EXT("bad partition id", st);
     }
 
-    printf("The partition for id %u is %s\n",
-          partition_id,
-          partition);
+    printf("The partition for id %u is %s\n", partition_id, partition);
 
     return 0;
 }
 
 int
-DoVosVolumeQuotaChange(struct cmd_syndesc *as, char *arock)
+DoVosVolumeQuotaChange(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum {SERVER, PARTITION, VOLUME, QUOTA}
-      DoVosVolumeQuotaChange_parm_t;
+    typedef enum { SERVER, PARTITION, VOLUME,
+       QUOTA
+    } DoVosVolumeQuotaChange_parm_t;
     afs_status_t st = 0;
     void *vos_server = NULL;
     unsigned int partition_id;
@@ -1687,16 +1590,15 @@ DoVosVolumeQuotaChange(struct cmd_syndesc *as, char *arock)
     unsigned int quota;
 
     if (as->parms[SERVER].items) {
-       if (!vos_ServerOpen(cellHandle,
-                           as->parms[SERVER].items->data,
-                           &vos_server,
-                           &st)) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
            ERR_ST_EXT("vos_ServerOpen", st);
        }
     }
 
     if (as->parms[PARTITION].items) {
-       partition_id = GetPartitionIdFromString(as->parms[PARTITION].items->data);
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
     }
 
     if (as->parms[VOLUME].items) {
@@ -1705,638 +1607,506 @@ DoVosVolumeQuotaChange(struct cmd_syndesc *as, char *arock)
     }
 
     if (as->parms[QUOTA].items) {
-       quota = GetIntFromString(as->parms[QUOTA].items->data,
-                                "invalid quota");
+       quota =
+           GetIntFromString(as->parms[QUOTA].items->data, "invalid quota");
     }
 
-    if (!vos_VolumeQuotaChange(cellHandle,
-                              vos_server,
-                              0,
-                              partition_id,
-                              volume_id,
-                              quota,
-                              &st)) {
+    if (!vos_VolumeQuotaChange
+       (cellHandle, vos_server, 0, partition_id, volume_id, quota, &st)) {
        ERR_ST_EXT("vos_VolumeQuotaChange", st);
     }
 
     return 0;
 }
 
+/*
+ * Parse a server name/address and return the address in HOST BYTE order
+ */
+static afs_uint32
+GetServer(char *aname)
+{
+    register struct hostent *th;
+    afs_uint32 addr;
+    int b1, b2, b3, b4;
+    register afs_int32 code;
+    char hostname[MAXHOSTCHARS];
+
+    code = sscanf(aname, "%d.%d.%d.%d", &b1, &b2, &b3, &b4);
+    if (code == 4) {
+       addr = (b1 << 24) | (b2 << 16) | (b3 << 8) | b4;
+       addr = ntohl(addr);     /* convert to host order */
+    } else {
+       th = gethostbyname(aname);
+       if (!th)
+           return 0;
+       memcpy(&addr, th->h_addr, sizeof(addr));
+    }
+
+    if (addr == htonl(0x7f000001)) {   /* local host */
+       code = gethostname(hostname, MAXHOSTCHARS);
+       if (code)
+           return 0;
+       th = gethostbyname(hostname);   /* returns host byte order */
+       if (!th)
+           return 0;
+       memcpy(&addr, th->h_addr, sizeof(addr));
+    }
+
+    return (addr);
+}
+
+static void
+Print_vos_volintInfo(afs_uint32 server, afs_uint32 partition, volintInfo* pinfo, const char *prefix)
+{
+    static afs_uint32 server_cache;
+    static int cache_valid = 0;
+    static char hostname[256], address[32];
+
+    if (!cache_valid || server != server_cache) {
+       struct in_addr s;
+
+       s.s_addr = server;
+       strcpy(hostname, hostutil_GetNameByINet(server));
+       strcpy(address, inet_ntoa(s));
+       server_cache = server;
+       cache_valid = 1;
+    }
+    
+    
+    printf("%sname\t\t%s\n",prefix, pinfo->name);
+    printf("%sid\t\t%lu\n",prefix, pinfo->volid);
+    printf("%sserv\t\t%s\t%s\n",prefix, address,hostname);
+    printf("%spart\t\t%u\n", prefix,partition);
+    
+    switch (pinfo->status) {
+    case 2: /* VOK */
+       printf("%sstatus\t\tOK\n",prefix);
+       break;
+    case 101: /* VBUSY */
+       printf("%sstatus\t\tBUSY\n",prefix);
+       return;
+    default:
+       printf("%sstatus\t\tUNATTACHABLE\n",prefix);
+       return;
+    }
+    printf("%sbackupID\t%lu\n",prefix, pinfo->backupID);
+    printf("%sparentID\t%lu\n",prefix, pinfo->parentID);
+    printf("%scloneID\t%lu\n",prefix, pinfo->cloneID);
+    printf("%sinUse\t\t%s\n",prefix, pinfo->inUse ? "Y" : "N");
+    printf("%sneedsSalvaged\t%s\n",prefix, pinfo->needsSalvaged ? "Y" : "N");
+    /* 0xD3 is from afs/volume.h since I had trouble including the file */
+    printf("%sdestroyMe\t%s\n",prefix, pinfo->destroyMe == 0xD3 ? "Y" : "N");
+    switch (pinfo->type) {
+    case 0:
+       printf("%stype\t\tRW\n",prefix);
+       break;
+    case 1:
+       printf("%stype\t\tRO\n",prefix);
+       break;
+    case 2:
+       printf("%stype\t\tBK\n",prefix);
+       break;
+    default:
+       printf("%stype\t\t?\n",prefix);
+       break;
+    }
+    printf("%screationDate\t%-9lu\n", prefix,pinfo->creationDate);
+    printf("%saccessDate\t%-9lu\n", prefix,pinfo->accessDate);
+    printf("%supdateDate\t%-9lu\n", prefix,pinfo->updateDate);
+    printf("%sbackupDate\t%-9lu\n", prefix,pinfo->backupDate);
+    printf("%scopyDate\t%-9lu\n", prefix,pinfo->copyDate);
+           
+    printf("%sflags\t\t%#lx\t(Optional)\n",prefix, pinfo->flags);
+    printf("%sdiskused\t%u\n",prefix, pinfo->size);
+    printf("%smaxquota\t%u\n",prefix, pinfo->maxquota);
+    printf("%sminquota\t%lu\t(Optional)\n",prefix, pinfo->spare0);
+    printf("%sfilecount\t%u\n",prefix, pinfo->filecount);
+    printf("%sdayUse\t\t%u\n",prefix, pinfo->dayUse);
+    printf("%sweekUse\t%lu\t(Optional)\n",prefix, pinfo->spare1);
+    printf("%svolUpdateCounter\t\t%lu\t(Optional)\n",prefix, pinfo->spare2);
+    printf("%sspare3\t\t%lu\t(Optional)\n",prefix, pinfo->spare3);
+}
+
+int
+DoVosVolumeGet2(struct cmd_syndesc *as, void *arock)
+{
+    typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeGet_parm_t;
+    afs_status_t st = 0;
+    void *vos_server = NULL;
+    afs_uint32 partition_id;
+    afs_uint32 volume_id;
+
+       volintInfo info;
+       memset(&info, 0, sizeof(struct volintInfo));
+
+    if (as->parms[SERVER].items) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
+           ERR_ST_EXT("vos_ServerOpen", st);
+       }
+    }
+
+    if (as->parms[PARTITION].items) {
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
+    }
+
+    if (as->parms[VOLUME].items) {
+       const char *volume = as->parms[VOLUME].items->data;
+       volume_id = GetVolumeIdFromString(volume);
+    }
+    
+
+       if (!vos_VolumeGet2
+       (cellHandle, vos_server, 0, partition_id, volume_id, &info, &st)) {
+       ERR_ST_EXT("vos_VolumeGet2", st);
+    }
+
+
+    Print_vos_volintInfo(GetServer(as->parms[SERVER].items->data),partition_id,&info," ");
+
+    return 0;
+}
+
+
+int
+DoVos_ClearVolUpdateCounter(struct cmd_syndesc *as, void *arock)
+{
+    typedef enum { SERVER, PARTITION, VOLUME } DoVosVolumeGet_parm_t;
+    afs_status_t st = 0;
+    void *vos_server = NULL;
+    unsigned int partition_id;
+    unsigned int volume_id;
+
+    if (as->parms[SERVER].items) {
+       if (!vos_ServerOpen
+           (cellHandle, as->parms[SERVER].items->data, &vos_server, &st)) {
+           ERR_ST_EXT("vos_ServerOpen", st);
+       }
+    }
+
+    if (as->parms[PARTITION].items) {
+       partition_id =
+           GetPartitionIdFromString(as->parms[PARTITION].items->data);
+    }
+
+    if (as->parms[VOLUME].items) {
+       const char *volume = as->parms[VOLUME].items->data;
+       volume_id = GetVolumeIdFromString(volume);
+    }
+
+    if (!vos_ClearVolUpdateCounter
+       (cellHandle, vos_server,partition_id, volume_id, &st)) {
+       ERR_ST_EXT("vos_ClearVolUpdateCounter", st);
+    }
+
+    return 0;
+}
+
 void
 SetupVosAdminCmd(void)
 {
-    struct cmd_syndesc *ts;
+    struct cmd_syndesc *ts;
 
-    ts = cmd_CreateSyntax("VosBackupVolumeCreate",
-                         DoVosBackupVolumeCreate, 0,
+    ts = cmd_CreateSyntax("VosBackupVolumeCreate", DoVosBackupVolumeCreate, NULL,
                          "create a backup volume");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "volume to back up");
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to back up");
     SetupCommonCmdArgs(ts);
 
     ts = cmd_CreateSyntax("VosBackupVolumeCreateMultiple",
-                         DoVosBackupVolumeCreateMultiple,
-                         0,
+                         DoVosBackupVolumeCreateMultiple, NULL,
                          "create a backup volume");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL,
                "server housing volumes to back up");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL,
                "partition housing volumes to back up");
-    cmd_AddParm(ts,
-               "-prefix",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-prefix", CMD_SINGLE, CMD_OPTIONAL,
                "common prefix of volumes to back up");
-    cmd_AddParm(ts,
-               "-exclude",
-               CMD_FLAG,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-exclude", CMD_FLAG, CMD_OPTIONAL,
                "exclude volumes from backup that match prefix");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosPartitionGet",
-                         DoVosPartitionGet,
-                         0,
+    ts = cmd_CreateSyntax("VosPartitionGet", DoVosPartitionGet, NULL,
                          "get information about a partition");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
                "server housing partition of interest");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
                "partition to query");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosPartitionList",
-                          DoVosPartitionList,
-                         0,
+    ts = cmd_CreateSyntax("VosPartitionList", DoVosPartitionList, NULL,
                          "list information about all partitions at a server");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
                "server housing partitions of interest");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosServerSync",
-                          DoVosServerSync,
-                         0,
+    ts = cmd_CreateSyntax("VosServerSync", DoVosServerSync, NULL,
                          "sync server with vldb");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "server to sync");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to sync");
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL,
                "partition to sync");
     SetupCommonCmdArgs(ts);
 
     ts = cmd_CreateSyntax("VosFileServerAddressChange",
-                         DoVosFileServerAddressChange,
-                         0,
+                         DoVosFileServerAddressChange, NULL,
                          "change a server's address in the vldb");
-    cmd_AddParm(ts,
-               "-oldaddress",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-oldaddress", CMD_SINGLE, CMD_REQUIRED,
                "old address to change");
-    cmd_AddParm(ts,
-               "-newaddress",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "new address");
+    cmd_AddParm(ts, "-newaddress", CMD_SINGLE, CMD_REQUIRED, "new address");
     SetupCommonCmdArgs(ts);
 
     ts = cmd_CreateSyntax("VosFileServerAddressRemove",
-                         DoVosFileServerAddressRemove,
-                         0,
+                         DoVosFileServerAddressRemove, NULL,
                          "remove a server's address from the vldb");
-    cmd_AddParm(ts,
-               "-address",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-address", CMD_SINGLE, CMD_REQUIRED,
                "address to remove");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosFileServerList",
-                         DoVosFileServerList,
-                         0,
+    ts = cmd_CreateSyntax("VosFileServerList", DoVosFileServerList, NULL,
                          "list the file servers in a cell");
     SetupCommonCmdArgs(ts);
 
     ts = cmd_CreateSyntax("VosServerTransactionStatusList",
-                         DoVosServerTransactionStatusList,
-                         0,
+                         DoVosServerTransactionStatusList, NULL,
                          "list the active transactions at a server");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "server to query");
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVLDBGet",
-                         DoVosVLDBGet,
-                         0,
+    ts = cmd_CreateSyntax("VosVLDBGet", DoVosVLDBGet, NULL,
                          "get a vldb entry for a volume");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED,
                "volume to retrieve");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVLDBList",
-                         DoVosVLDBList,
-                         0,
+    ts = cmd_CreateSyntax("VosVLDBList", DoVosVLDBList, NULL,
                          "list a group of vldb entries");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL,
                "limit entries to a particular server");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL,
                "limit entries to a particular partition");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVLDBEntryRemove",
-                         DoVosVLDBEntryRemove,
-                         0,
+    ts = cmd_CreateSyntax("VosVLDBEntryRemove", DoVosVLDBEntryRemove, NULL,
                          "remove vldb entries");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL,
                "limit entries to a particular server");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL,
                "limit entries to a particular partition");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
-               "volume to remove");
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_OPTIONAL, "volume to remove");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVLDBUnlock",
-                         DoVosVLDBUnlock,
-                         0,
+    ts = cmd_CreateSyntax("VosVLDBUnlock", DoVosVLDBUnlock, NULL,
                          "unlock a group of vldb entries");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL,
                "limit entries to a particular server");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL,
                "limit entries to a particular partition");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVLDBEntryLock",
-                         DoVosVLDBList,
-                         0,
+    ts = cmd_CreateSyntax("VosVLDBEntryLock", DoVosVLDBList, NULL,
                          "lock a single vldb entry");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "volume to lock");
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to lock");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVLDBEntryUnlock",
-                         DoVosVLDBEntryUnlock,
-                         0,
+    ts = cmd_CreateSyntax("VosVLDBEntryUnlock", DoVosVLDBEntryUnlock, NULL,
                          "unlock a single vldb entry");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "volume to unlock");
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to unlock");
     SetupCommonCmdArgs(ts);
 
     ts = cmd_CreateSyntax("VosVLDBReadOnlySiteCreate",
-                         DoVosVLDBReadOnlySiteCreate,
-                         0,
+                         DoVosVLDBReadOnlySiteCreate, NULL,
                          "create a read only site");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
                "server where read only will be created");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
                "partition where read only will be created");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED,
                "volume to replicate");
     SetupCommonCmdArgs(ts);
 
     ts = cmd_CreateSyntax("VosVLDBReadOnlySiteDelete",
-                         DoVosVLDBReadOnlySiteDelete,
-                         0,
+                         DoVosVLDBReadOnlySiteDelete, NULL,
                          "delete a read only site before initial replication");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL,
                "server where read only will be deleted");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL,
                "partition where read only will be deleted");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "volume to delete");
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to delete");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVLDBSync",
-                         DoVosVLDBSync,
-                         0,
+    ts = cmd_CreateSyntax("VosVLDBSync", DoVosVLDBSync, NULL,
                          "sync vldb with server");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "server to sync");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to sync");
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL,
                "limit sync to a particular partition");
-    cmd_AddParm(ts,
-               "-force",
-               CMD_FLAG,
-               CMD_OPTIONAL,
-               "force sync to occur");
+    cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "force sync to occur");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeCreate",
-                         DoVosVolumeCreate,
-                         0,
+    ts = cmd_CreateSyntax("VosVolumeCreate", DoVosVolumeCreate, NULL,
                          "create a read write volume");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
                "server where volume will be created");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
                "partition where volume will be created");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED,
                "name of new volume");
-    cmd_AddParm(ts,
-               "-quota",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-quota", CMD_SINGLE, CMD_REQUIRED,
                "size quota of new volume in 1kb units");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeDelete",
-                         DoVosVolumeDelete,
-                         0,
+    ts = cmd_CreateSyntax("VosVolumeDelete", DoVosVolumeDelete, NULL,
                          "delete a volume");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
                "server where volume exists");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
                "partition where volume exists");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "volume to delete");
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to delete");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeRename",
-                         DoVosVolumeRename,
-                         0,
+    ts = cmd_CreateSyntax("VosVolumeRename", DoVosVolumeRename, NULL,
                          "rename a volume");
-    cmd_AddParm(ts,
-               "-oldname",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "old volume name");
-    cmd_AddParm(ts,
-               "-newname",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "new volume name");
+    cmd_AddParm(ts, "-oldname", CMD_SINGLE, CMD_REQUIRED, "old volume name");
+    cmd_AddParm(ts, "-newname", CMD_SINGLE, CMD_REQUIRED, "new volume name");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeDump",
-                         DoVosVolumeDump,
-                         0,
+    ts = cmd_CreateSyntax("VosVolumeDump", DoVosVolumeDump, NULL,
                          "dump a volume to a file");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL,
                "dump volume at a particular server");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL,
                "dump volume at a particular partition");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "volume to dump");
-    cmd_AddParm(ts,
-               "-starttime",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to dump");
+    cmd_AddParm(ts, "-starttime", CMD_SINGLE, CMD_REQUIRED,
                "files modified after this time will be dumped");
-    cmd_AddParm(ts,
-               "-dumpfile",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-dumpfile", CMD_SINGLE, CMD_REQUIRED,
                "file to contain dump results");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeRestore",
-                         DoVosVolumeRestore,
-                         0,
+    ts = cmd_CreateSyntax("VosVolumeRestore", DoVosVolumeRestore, NULL,
                          "restore a volume from a dumpfile");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
                "server that houses volume to restore");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
                "partition that houses volume to restore");
-    cmd_AddParm(ts,
-               "-id",
-               CMD_SINGLE,
-               CMD_OPTIONAL,
-               "id of volume restored");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_OPTIONAL, "id of volume restored");
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED,
                "name of volume restored");
-    cmd_AddParm(ts,
-               "-dumpfile",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-dumpfile", CMD_SINGLE, CMD_REQUIRED,
                "file contained dump of volume");
-    cmd_AddParm(ts,
-               "-full",
-               CMD_FLAG,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-full", CMD_FLAG, CMD_OPTIONAL,
                "does a full restore of volume");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeOnline",
-                         DoVosVolumeOnline,
-                         0,
+    ts = cmd_CreateSyntax("VosVolumeOnline", DoVosVolumeOnline, NULL,
                          "bring a volume online");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
                "server that houses volume");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
                "partition that houses volume");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED,
                "volume to bring online");
-    cmd_AddParm(ts,
-               "-sleep",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "seconds to sleep");
-    cmd_AddParm(ts,
-               "-busy",
-               CMD_FLAG,
-               CMD_OPTIONAL,
-               "mark volume busy");
+    cmd_AddParm(ts, "-sleep", CMD_SINGLE, CMD_REQUIRED, "seconds to sleep");
+    cmd_AddParm(ts, "-busy", CMD_FLAG, CMD_OPTIONAL, "mark volume busy");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeOffline",
-                         DoVosVolumeOffline,
-                         0,
+    ts = cmd_CreateSyntax("VosVolumeOffline", DoVosVolumeOffline, NULL,
                          "take a volume offline");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
                "server that houses volume");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
                "partition that houses volume");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED,
                "volume to bring offline");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeGet",
-                         DoVosVolumeGet,
-                         0,
+    ts = cmd_CreateSyntax("VosVolumeGet", DoVosVolumeGet, NULL,
                          "get a volume entry");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
                "server that houses volume");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
                "partition that houses volume");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED,
                "volume to retrieve");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeList",
-                         DoVosVolumeList,
-                         0,
+    ts = cmd_CreateSyntax("VosVolumeList", DoVosVolumeList, NULL,
                          "list a group of volumes");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
                "limit volumes to a particular server");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
                "limit volumes to a particular partition");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeMove",
-                         DoVosVolumeMove,
-                         0,
+    ts = cmd_CreateSyntax("VosVolumeMove", DoVosVolumeMove, NULL,
                          "move a volume");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "volume to move");
-    cmd_AddParm(ts,
-               "-fromserver",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "source server");
-    cmd_AddParm(ts,
-               "-frompartition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to move");
+    cmd_AddParm(ts, "-fromserver", CMD_SINGLE, CMD_REQUIRED, "source server");
+    cmd_AddParm(ts, "-frompartition", CMD_SINGLE, CMD_REQUIRED,
                "source partition");
-    cmd_AddParm(ts,
-               "-toserver",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-toserver", CMD_SINGLE, CMD_REQUIRED,
                "destination server");
-    cmd_AddParm(ts,
-               "-topartition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-topartition", CMD_SINGLE, CMD_REQUIRED,
                "destination partition");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeRelease",
-                         DoVosVolumeRelease,
-                         0,
+    ts = cmd_CreateSyntax("VosVolumeRelease", DoVosVolumeRelease, NULL,
                          "release updates to read only");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED,
                "volume to replicate");
-    cmd_AddParm(ts,
-               "-force",
-               CMD_FLAG,
-               CMD_OPTIONAL,
+    cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL,
                "force release to occur");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeZap",
-                         DoVosVolumeZap,
-                         0,
-                         "zap a volume");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    ts = cmd_CreateSyntax("VosVolumeZap", DoVosVolumeZap, NULL, "zap a volume");
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
                "server that houses the volume to zap");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
                "partition that houses the volume to zap");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "volume to zap");
-    cmd_AddParm(ts,
-               "-force",
-               CMD_FLAG,
-               CMD_OPTIONAL,
-               "force zap");
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to zap");
+    cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "force zap");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosPartitionNameToId",
-                         DoVosPartitionNameToId,
-                         0,
+    ts = cmd_CreateSyntax("VosPartitionNameToId", DoVosPartitionNameToId, NULL,
                          "convert a partition name to a number");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
                "partition to convert");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosPartitionIdToName",
-                         DoVosPartitionIdToName,
-                         0,
+    ts = cmd_CreateSyntax("VosPartitionIdToName", DoVosPartitionIdToName, NULL,
                          "convert a number to a partition");
-    cmd_AddParm(ts,
-               "-id",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "number to convert");
+    cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_REQUIRED, "number to convert");
     SetupCommonCmdArgs(ts);
 
-    ts = cmd_CreateSyntax("VosVolumeQuotaChange",
-                         DoVosVolumeQuotaChange,
-                         0,
+    ts = cmd_CreateSyntax("VosVolumeQuotaChange", DoVosVolumeQuotaChange, NULL,
                          "change the quota for a partition");
-    cmd_AddParm(ts,
-               "-server",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
                "server that houses the volume");
-    cmd_AddParm(ts,
-               "-partition",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
                "partition that houses the volume");
-    cmd_AddParm(ts,
-               "-volume",
-               CMD_SINGLE,
-               CMD_REQUIRED,
-               "volume to change");
-    cmd_AddParm(ts,
-               "-quota",
-               CMD_SINGLE,
-               CMD_REQUIRED,
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to change");
+    cmd_AddParm(ts, "-quota", CMD_SINGLE, CMD_REQUIRED,
                "new quota in 1kb units");
     SetupCommonCmdArgs(ts);
 
+    ts = cmd_CreateSyntax("VosVolumeGet2", DoVosVolumeGet2, NULL,
+                         "get a volume entry");
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
+               "server that houses volume");
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
+               "partition that houses volume");
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED,
+               "volume to retrieve");
+    SetupCommonCmdArgs(ts);
+    
+    ts = cmd_CreateSyntax("ClearVolUpdateCounter", DoVos_ClearVolUpdateCounter, NULL,
+                         "clear volUpdateCounter");
+    cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED,
+               "server that houses volume");
+    cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED,
+               "partition that houses volume");
+    cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED,
+               "volume");
+    SetupCommonCmdArgs(ts);
+
 }
+