From 56e350b8559cbc16ee9087dd8ada47fe9a9d79f2 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Thu, 17 May 2012 12:29:51 +0100 Subject: [PATCH] auth & [ak]log: 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's unecessary noise. Change-Id: I270b81c239afb9ac4bd8121adfd5a48fcfac9c3b Reviewed-on: http://gerrit.openafs.org/7465 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/aklog/aklog.c | 2 +- src/auth/ktc.c | 2 +- src/auth/ktc_nt.c | 2 +- src/log/unlog.c | 3 +-- src/tsm41/aix_aklog.c | 2 +- src/tsm41/aix_auth_common.c | 6 +++--- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c index d78ff7b..43db12f 100644 --- a/src/aklog/aklog.c +++ b/src/aklog/aklog.c @@ -345,7 +345,7 @@ copy_cellinfo(cellinfo_t *cellinfo) { cellinfo_t *new_cellinfo; - if ((new_cellinfo = (cellinfo_t *)malloc(sizeof(cellinfo_t)))) + if ((new_cellinfo = malloc(sizeof(cellinfo_t)))) memcpy(new_cellinfo, cellinfo, sizeof(cellinfo_t)); return ((char *)new_cellinfo); diff --git a/src/auth/ktc.c b/src/auth/ktc.c index 7307111..036bb6a 100644 --- a/src/auth/ktc.c +++ b/src/auth/ktc.c @@ -1820,7 +1820,7 @@ extern char **environ; for (senv = environ, numenv = 0; *senv; senv++) numenv++; - newenv = (char **)malloc((numenv + 2) * sizeof(char *)); + newenv = malloc((numenv + 2) * sizeof(char *)); for (senv = environ, denv = newenv; *senv; senv++) { if (strncmp(*senv, "KRBTKFILE=", 10) != 0 && diff --git a/src/auth/ktc_nt.c b/src/auth/ktc_nt.c index c4b36f2..8a91720 100644 --- a/src/auth/ktc_nt.c +++ b/src/auth/ktc_nt.c @@ -64,7 +64,7 @@ char rpcErr[256]; void __RPC_FAR *__RPC_USER midl_user_allocate(size_t cBytes) { - return ((void __RPC_FAR *)malloc(cBytes)); + return malloc(cBytes); } void __RPC_USER diff --git a/src/log/unlog.c b/src/log/unlog.c index 9e39ce6..f2760aa 100644 --- a/src/log/unlog.c +++ b/src/log/unlog.c @@ -143,8 +143,7 @@ unlog_ForgetCertainTokens(char **list, int listSize) code = ktc_ListTokens(count, &count, &serviceName); } while (!code); - tokenInfoP = - (struct tokenInfo *)malloc((sizeof(struct tokenInfo) * count)); + tokenInfoP = malloc((sizeof(struct tokenInfo) * count)); if (!tokenInfoP) { perror("unlog_ForgetCertainTokens -- osi_Alloc failed"); exit(1); diff --git a/src/tsm41/aix_aklog.c b/src/tsm41/aix_aklog.c index 958765f..a450a9f 100644 --- a/src/tsm41/aix_aklog.c +++ b/src/tsm41/aix_aklog.c @@ -166,7 +166,7 @@ aklog_authenticate(char *userName, char *response, int *reenter, char **message) if (status) { char *str = afs_error_message(status); - *message = (char *)malloc(1024); + *message = malloc(1024); #ifdef HAVE_KRB5_SVC_GET_MSG if (strncmp(str, "unknown", strlen("unknown")) == 0) { krb5_svc_get_msg(status,&str); diff --git a/src/tsm41/aix_auth_common.c b/src/tsm41/aix_auth_common.c index 8772f93..3396d11 100644 --- a/src/tsm41/aix_auth_common.c +++ b/src/tsm41/aix_auth_common.c @@ -46,7 +46,7 @@ afs_authenticate(char *userName, char *response, int *reenter, char **message) if (strlen(pword) == 0) { printf ("Unable to read password because zero length passord is illegal\n"); - *message = (char *)malloc(256); + *message = malloc(256); sprintf(*message, "Unable to read password because zero length passord is illegal\n"); return AUTH_FAILURE; @@ -54,7 +54,7 @@ afs_authenticate(char *userName, char *response, int *reenter, char **message) } if ((pwd = getpwnam(userName)) == NULL) { - *message = (char *)malloc(256); + *message = malloc(256); sprintf(*message, "getpwnam for user failed\n"); return AUTH_FAILURE; } @@ -65,7 +65,7 @@ afs_authenticate(char *userName, char *response, int *reenter, char **message) &password_expires, 0, &reason)) { if (code == KANOENT) return AUTH_NOTFOUND; - *message = (char *)malloc(1024); + *message = malloc(1024); sprintf(*message, "Unable to authenticate to AFS because %s.\n", reason); return AUTH_FAILURE; -- 1.9.4