Don't cast the return from calloc()

[openafs.git] / src / libadmin / vos / afs_vosAdmin.c

diff --git a/src/libadmin/vos/afs_vosAdmin.c b/src/libadmin/vos/afs_vosAdmin.c
index 15d1701..3eba22c 100644 (file)
--- a/src/libadmin/vos/afs_vosAdmin.c
+++ b/src/libadmin/vos/afs_vosAdmin.c
@@ -9,33 +9,33 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 
-RCSID
-    ("$Header$");
+#include <roken.h>
 
-#include <afs/stds.h>
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
-#ifdef AFS_NT40_ENV
-#include <winsock2.h>
-#include <io.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#endif
-#include "afs_vosAdmin.h"
-#include "../adminutil/afs_AdminInternal.h"
-#include <afs/afs_utilAdmin.h>
+
 #include <afs/vlserver.h>
 #include <afs/volser.h>
 #include <afs/volint.h>
+
+#include "afs_vosAdmin.h"
+#include "../adminutil/afs_AdminInternal.h"
+
+/* File descriptors are HANDLE's on NT. The following typedef helps catch
+ * type errors. Duplicated from vol/ihandle.h
+ */
+#ifdef AFS_NT40_ENV
+typedef HANDLE FD_t;
+#else
+typedef int FD_t;
+#endif
+#define INVALID_FD ((FD_t)-1)
+
 #include <afs/partition.h>
 #include <rx/rx.h>
+#include <rx/rxstat.h>
+#include <afs/afs_utilAdmin.h>
 #include "vosutils.h"
 #include "vsprocs.h"
 #include "lockprocs.h"
@@ -317,7 +317,7 @@ vos_BackupVolumeCreateMultiple(const void *cellHandle,
     size_t prefix_len = 0;
     nbulkentries arrayEntries;
     afs_int32 nentries = 0;
-    register struct nvldbentry *entry;
+    struct nvldbentry *entry;
     int i;
     afs_int32 rw_volid, rw_server, rw_partition;
     int previdx;
@@ -689,8 +689,7 @@ vos_PartitionGetBegin(const void *cellHandle, const void *serverHandle,
     file_server_p f_server = (file_server_p) serverHandle;
     afs_admin_iterator_p iter =
        (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
-    partition_get_p part =
-       (partition_get_p) calloc(1, sizeof(partition_get_t));
+    partition_get_p part = calloc(1, sizeof(partition_get_t));
 
     /*
      * Validate arguments
@@ -1069,8 +1068,9 @@ vos_ServerSync(const void *cellHandle, const void *serverHandle,
 
 int ADMINAPI
 vos_FileServerAddressChange(const void *cellHandle,
-                           vos_MessageCallBack_t callBack, int oldAddress,
-                           int newAddress, afs_status_p st)
+                           vos_MessageCallBack_t callBack,
+                           unsigned int oldAddress,
+                           unsigned int newAddress, afs_status_p st)
 {
     int rc = 0;
     afs_status_t tst = 0;
@@ -1085,8 +1085,7 @@ vos_FileServerAddressChange(const void *cellHandle,
     }
 
     tst =
-       ubik_Call_New(VL_ChangeAddr, c_handle->vos, 0, oldAddress,
-                     newAddress);
+       ubik_VL_ChangeAddr(c_handle->vos, 0, oldAddress, newAddress);
     if (tst) {
        goto fail_vos_FileServerAddressChange;
     }
@@ -1124,13 +1123,14 @@ vos_FileServerAddressChange(const void *cellHandle,
 
 int ADMINAPI
 vos_FileServerAddressRemove(const void *cellHandle,
-                           vos_MessageCallBack_t callBack, int serverAddress,
+                           vos_MessageCallBack_t callBack,
+                           unsigned int serverAddress,
                            afs_status_p st)
 {
     int rc = 0;
     afs_status_t tst = 0;
     afs_cell_handle_p c_handle = (afs_cell_handle_p) cellHandle;
-    int dummyAddress = 0xffffffff;
+    unsigned int dummyAddress = 0xffffffff;
 
     /*
      * Validate arguments
@@ -1141,7 +1141,7 @@ vos_FileServerAddressRemove(const void *cellHandle,
     }
 
     tst =
-       ubik_Call_New(VL_ChangeAddr, c_handle->vos, 0, dummyAddress,
+       ubik_VL_ChangeAddr(c_handle->vos, 0, dummyAddress,
                      serverAddress);
     if (tst) {
        goto fail_vos_FileServerAddressRemove;
@@ -1335,7 +1335,7 @@ vos_FileServerGetBegin(const void *cellHandle, vos_MessageCallBack_t callBack,
     afs_cell_handle_p c_handle = (afs_cell_handle_p) cellHandle;
     afs_admin_iterator_p iter =
        (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
-    server_get_p serv = (server_get_p) calloc(1, sizeof(server_get_t));
+    server_get_p serv = calloc(1, sizeof(server_get_t));
     struct VLCallBack unused;
 
 
@@ -1362,7 +1362,7 @@ vos_FileServerGetBegin(const void *cellHandle, vos_MessageCallBack_t callBack,
 
     serv->vldb = c_handle->vos;
     tst =
-       ubik_Call_New(VL_GetAddrs, c_handle->vos, 0, 0, 0, &unused,
+       ubik_VL_GetAddrs(c_handle->vos, 0, 0, 0, &unused,
                      &serv->total_addresses, &serv->addresses);
 
     if (tst) {
@@ -1674,8 +1674,7 @@ vos_ServerTransactionStatusGetBegin(const void *cellHandle,
     file_server_p f_server = (file_server_p) serverHandle;
     afs_admin_iterator_p iter =
        (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
-    transaction_get_p tran =
-       (transaction_get_p) calloc(1, sizeof(transaction_get_t));
+    transaction_get_p tran = calloc(1, sizeof(transaction_get_t));
 
 
     /*
@@ -1937,7 +1936,7 @@ copyVLDBEntry(struct nvldbentry *source, vos_vldbEntry_p dest,
 
 int ADMINAPI
 vos_VLDBGet(const void *cellHandle, vos_MessageCallBack_t callBack,
-           const unsigned int *volumeId, const char *volumeName,
+           const unsigned int *volumeId, char *volumeName,
            vos_vldbEntry_p vldbEntry, afs_status_p st)
 {
     int rc = 0;
@@ -2124,8 +2123,7 @@ vos_VLDBGetBegin(const void *cellHandle, const void *serverHandle,
     file_server_p f_server = (file_server_p) serverHandle;
     afs_admin_iterator_p iter =
        (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
-    vldb_entry_get_p entry =
-       (vldb_entry_get_p) calloc(1, sizeof(vldb_entry_get_t));
+    vldb_entry_get_p entry = calloc(1, sizeof(vldb_entry_get_t));
     struct VldbListByAttributes attr;
 
     attr.Mask = 0;
@@ -2867,7 +2865,7 @@ vos_VLDBSync(const void *cellHandle, const void *serverHandle,
 int ADMINAPI
 vos_VolumeCreate(const void *cellHandle, const void *serverHandle,
                 vos_MessageCallBack_t callBack, unsigned int partition,
-                const char *volumeName, unsigned int quota,
+                char *volumeName, unsigned int quota,
                 unsigned int *volumeId, afs_status_p st)
 {
     int rc = 0;
@@ -3039,7 +3037,7 @@ vos_VolumeDelete(const void *cellHandle, const void *serverHandle,
 
 int ADMINAPI
 vos_VolumeRename(const void *cellHandle, vos_MessageCallBack_t callBack,
-                unsigned int readWriteVolumeId, const char *newVolumeName,
+                unsigned int readWriteVolumeId, char *newVolumeName,
                 afs_status_p st)
 {
     int rc = 0;
@@ -3209,7 +3207,7 @@ vos_VolumeDump(const void *cellHandle, const void *serverHandle,
 int ADMINAPI
 vos_VolumeRestore(const void *cellHandle, const void *serverHandle,
                  vos_MessageCallBack_t callBack, unsigned int partition,
-                 unsigned int *volumeId, const char *volumeName,
+                 unsigned int *volumeId, char *volumeName,
                  const char *dumpFile, vos_volumeRestoreType_t dumpType,
                  afs_status_p st)
 {
@@ -3495,7 +3493,7 @@ copyvolintXInfo(struct volintXInfo *source, vos_volumeEntry_p dest,
      * user from seeing stale data from a previous call
      */
 
-    memset(dest, 0, sizeof(dest));
+    memset(dest, 0, sizeof(*dest));
 
     switch (source->status) {
     case VOK:
@@ -3805,7 +3803,7 @@ vos_VolumeGetBegin(const void *cellHandle, const void *serverHandle,
     file_server_p f_server = (file_server_p) serverHandle;
     afs_admin_iterator_p iter =
        (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
-    volume_get_p entry = (volume_get_p) calloc(1, sizeof(volume_get_t));
+    volume_get_p entry = calloc(1, sizeof(volume_get_t));
 
     /*
      * Validate arguments