libadmin: Remove redundant memset call

[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 3eba22c..dfcef7f 100644 (file)
--- a/src/libadmin/vos/afs_vosAdmin.c
+++ b/src/libadmin/vos/afs_vosAdmin.c
@@ -16,6 +16,7 @@
 #include <ctype.h>
 
 #include <afs/vlserver.h>
+#include <afs/afsint.h>
 #include <afs/volser.h>
 #include <afs/volint.h>
 
@@ -324,7 +325,8 @@ vos_BackupVolumeCreateMultiple(const void *cellHandle,
     int equal = 0;
     char backbuf[1024];
 
-    memset((void *)&attr, 0, sizeof(attr));
+    memset(&attr, 0, sizeof(attr));
+    memset(&arrayEntries, 0, sizeof(arrayEntries));
 
     /*
      * Validate arguments
@@ -370,8 +372,6 @@ vos_BackupVolumeCreateMultiple(const void *cellHandle,
        prefix_len = strlen(volumePrefix);
     }
 
-    memset((void *)&arrayEntries, 0, sizeof(arrayEntries));
-
     /*
      * Get a list of all the volumes in the cell
      */
@@ -687,8 +687,7 @@ vos_PartitionGetBegin(const void *cellHandle, const void *serverHandle,
     int rc = 0;
     afs_status_t tst = 0;
     file_server_p f_server = (file_server_p) serverHandle;
-    afs_admin_iterator_p iter =
-       (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
+    afs_admin_iterator_p iter = malloc(sizeof(afs_admin_iterator_t));
     partition_get_p part = calloc(1, sizeof(partition_get_t));
 
     /*
@@ -875,7 +874,7 @@ vos_ServerOpen(const void *cellHandle, const char *serverName,
     int rc = 0;
     afs_status_t tst = 0;
     afs_cell_handle_p c_handle = (afs_cell_handle_p) cellHandle;
-    file_server_p f_server = (file_server_p) malloc(sizeof(file_server_t));
+    file_server_p f_server = malloc(sizeof(file_server_t));
     int server_address;
     struct rx_securityClass *sc[3];
     int scIndex;
@@ -1333,8 +1332,7 @@ vos_FileServerGetBegin(const void *cellHandle, vos_MessageCallBack_t callBack,
     int rc = 0;
     afs_status_t tst = 0;
     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));
+    afs_admin_iterator_p iter = malloc(sizeof(afs_admin_iterator_t));
     server_get_p serv = calloc(1, sizeof(server_get_t));
     struct VLCallBack unused;
 
@@ -1672,8 +1670,7 @@ vos_ServerTransactionStatusGetBegin(const void *cellHandle,
     int rc = 0;
     afs_status_t tst = 0;
     file_server_p f_server = (file_server_p) serverHandle;
-    afs_admin_iterator_p iter =
-       (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
+    afs_admin_iterator_p iter = malloc(sizeof(afs_admin_iterator_t));
     transaction_get_p tran = calloc(1, sizeof(transaction_get_t));
 
 
@@ -2121,8 +2118,7 @@ vos_VLDBGetBegin(const void *cellHandle, const void *serverHandle,
     afs_status_t tst = 0;
     afs_cell_handle_p c_handle = (afs_cell_handle_p) 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));
+    afs_admin_iterator_p iter = malloc(sizeof(afs_admin_iterator_t));
     vldb_entry_get_p entry = calloc(1, sizeof(vldb_entry_get_t));
     struct VldbListByAttributes attr;
 
@@ -3801,8 +3797,7 @@ vos_VolumeGetBegin(const void *cellHandle, const void *serverHandle,
     int rc = 0;
     afs_status_t tst = 0;
     file_server_p f_server = (file_server_p) serverHandle;
-    afs_admin_iterator_p iter =
-       (afs_admin_iterator_p) malloc(sizeof(afs_admin_iterator_t));
+    afs_admin_iterator_p iter = malloc(sizeof(afs_admin_iterator_t));
     volume_get_p entry = calloc(1, sizeof(volume_get_t));
 
     /*