xstat: Don't cast returns from malloc()

malloc() returns a (void *) on all of our current platforms. So,
don't bother casting the return value before assigning it - it is
unnecessary noise.

Change-Id: Iaddc6c44041dc77a576f32133b2aa80aefce5cb2
Reviewed-on: http://gerrit.openafs.org/7469
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>

diff --git a/src/xstat/xstat_cm.c b/src/xstat/xstat_cm.c
index c7227d224916de2d29a1edfbbd9cd5c3d839c414..31ced2bd1aee8af7e7dfbc99b85f1a901c86bf1c 100644 (file)
--- a/src/xstat/xstat_cm.c
+++ b/src/xstat/xstat_cm.c
@@ -448,7 +448,7 @@ xstat_cm_Init(int a_numServers, struct sockaddr_in *a_socketArray,
     xstat_cm_ProbeFreqInSecs = a_ProbeFreqInSecs;
     xstat_cm_numCollections = a_numCollections;
     collIDBytes = xstat_cm_numCollections * sizeof(afs_int32);
-    xstat_cm_collIDP = (afs_int32 *) (malloc(collIDBytes));
+    xstat_cm_collIDP = malloc(collIDBytes);
     memcpy(xstat_cm_collIDP, a_collIDP, collIDBytes);
     if (xstat_cm_debug) {
        printf("[%s] Asking for %d collection(s): ", rn,
@@ -470,8 +470,8 @@ xstat_cm_Init(int a_numServers, struct sockaddr_in *a_socketArray,
      * Allocate the necessary data structures and initialize everything
      * else.
      */
-    xstat_cm_ConnInfo = (struct xstat_cm_ConnectionInfo *)
-       malloc(a_numServers * sizeof(struct xstat_cm_ConnectionInfo));
+    xstat_cm_ConnInfo = malloc(a_numServers
+                              * sizeof(struct xstat_cm_ConnectionInfo));
     if (xstat_cm_ConnInfo == (struct xstat_cm_ConnectionInfo *)0) {
        fprintf(stderr,
                "[%s] Can't allocate %d connection info structs (%" AFS_SIZET_FMT " bytes)\n",

diff --git a/src/xstat/xstat_cm_test.c b/src/xstat/xstat_cm_test.c
index 50c49568356869e6dbc16b6c4ddc009e2fb4c9ca..71e6fc5b7ffec3ed3899f17a04d4332dff1dbb63 100644 (file)
--- a/src/xstat/xstat_cm_test.c
+++ b/src/xstat/xstat_cm_test.c
@@ -1459,8 +1459,7 @@ RunTheTest(struct cmd_syndesc *a_s, void *arock)
     if (debugging_on)
        printf("%s: Allocating socket array for %d Cache Manager(s)\n", rn,
               numCMs);
-    CMSktArray = (struct sockaddr_in *)
-       malloc(numCMs * sizeof(struct sockaddr_in));
+    CMSktArray = malloc(numCMs * sizeof(struct sockaddr_in));
     if (CMSktArray == (struct sockaddr_in *)0) {
        printf("%s: Can't allocate socket array for %d Cache Managers\n", rn,
               numCMs);
@@ -1494,7 +1493,7 @@ RunTheTest(struct cmd_syndesc *a_s, void *arock)
      */
     if (debugging_on)
        printf("Allocating %d long(s) for coll ID\n", numCollIDs);
-    collIDP = (afs_int32 *) (malloc(numCollIDs * sizeof(afs_int32)));
+    collIDP = malloc(numCollIDs * sizeof(afs_int32));
     currCollIDP = collIDP;
     curr_item = a_s->parms[P_COLL_IDS].items;
     for (currCollIDIdx = 0; currCollIDIdx < numCollIDs; currCollIDIdx++) {

diff --git a/src/xstat/xstat_fs.c b/src/xstat/xstat_fs.c
index e157bb970637c3ef01197d093207dcbc33e3caf0..e35469ebd7a4efb19f1c20b1f31b4cadf3de370b 100644 (file)
--- a/src/xstat/xstat_fs.c
+++ b/src/xstat/xstat_fs.c
@@ -477,7 +477,7 @@ xstat_fs_Init(int a_numServers, struct sockaddr_in *a_socketArray,
     xstat_fs_ProbeFreqInSecs = a_ProbeFreqInSecs;
     xstat_fs_numCollections = a_numCollections;
     collIDBytes = xstat_fs_numCollections * sizeof(afs_int32);
-    xstat_fs_collIDP = (afs_int32 *) (malloc(collIDBytes));
+    xstat_fs_collIDP = malloc(collIDBytes);
     memcpy(xstat_fs_collIDP, a_collIDP, collIDBytes);
     if (xstat_fs_debug) {
        printf("[%s] Asking for %d collection(s): ", rn,
@@ -499,8 +499,8 @@ xstat_fs_Init(int a_numServers, struct sockaddr_in *a_socketArray,
      * Allocate the necessary data structures and initialize everything
      * else.
      */
-    xstat_fs_ConnInfo = (struct xstat_fs_ConnectionInfo *)
-       malloc(a_numServers * sizeof(struct xstat_fs_ConnectionInfo));
+    xstat_fs_ConnInfo = malloc(a_numServers
+                              * sizeof(struct xstat_fs_ConnectionInfo));
     if (xstat_fs_ConnInfo == (struct xstat_fs_ConnectionInfo *)0) {
        fprintf(stderr,
                "[%s] Can't allocate %d connection info structs (%" AFS_SIZET_FMT " bytes)\n",

diff --git a/src/xstat/xstat_fs_callback.c b/src/xstat/xstat_fs_callback.c
index 35b6a7ca43068904c1749efedef1754319560dbe..05c3e4d2b3c06363ad2f095cb13eac08f36b9779 100644 (file)
--- a/src/xstat/xstat_fs_callback.c
+++ b/src/xstat/xstat_fs_callback.c
@@ -696,7 +696,7 @@ SRXAFSCB_GetLocalCell(struct rx_call * a_call, char **a_name)
 {
     char *t_name;
 
-    t_name = (char *)malloc(AFSNAMEMAX);
+    t_name = malloc(AFSNAMEMAX);
     if (!t_name)
        return ENOMEM;
     strcpy(t_name, "This is xstat_fs");

diff --git a/src/xstat/xstat_fs_test.c b/src/xstat/xstat_fs_test.c
index c90fd036fda0979643c9db16d78ddc3c5d1d6136..413d15cbf7bf6c683d8caa1929a3a2c81e2ae8cb 100644 (file)
--- a/src/xstat/xstat_fs_test.c
+++ b/src/xstat/xstat_fs_test.c
@@ -726,7 +726,7 @@ RunTheTest(struct cmd_syndesc *a_s, void *dummy)
      */
     if (debugging_on)
        printf("Allocating %d long(s) for coll ID\n", numCollIDs);
-    collIDP = (afs_int32 *) (malloc(numCollIDs * sizeof(afs_int32)));
+    collIDP = malloc(numCollIDs * sizeof(afs_int32));
     currCollIDP = collIDP;
     curr_item = a_s->parms[P_COLL_IDS].items;
     for (currCollIDIdx = 0; currCollIDIdx < numCollIDs; currCollIDIdx++) {