From 789a93e7a3fe2f6ac68ca48361b15b00b316488e Mon Sep 17 00:00:00 2001
From: Tim Wickberg <tim@schedmd.com>
Date: Wed, 30 Jan 2019 13:10:59 -0700
Subject: [PATCH] Stop casting the return from xmalloc().
---
src/slurmctld/groups.c | 4 ++--
src/slurmctld/job_mgr.c | 7 ++-----
src/slurmctld/job_scheduler.c | 2 +-
src/slurmctld/node_scheduler.c | 2 +-
src/slurmctld/partition_mgr.c | 4 +---
src/slurmctld/srun_comm.c | 4 ++--
src/slurmctld/step_mgr.c | 2 +-
7 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/slurmctld/groups.c b/src/slurmctld/groups.c
index b91ca8fa541..41b3215e04d 100644
--- a/src/slurmctld/groups.c
+++ b/src/slurmctld/groups.c
@@ -260,7 +260,7 @@ static uid_t *_get_group_cache(char *group_name)
if (xstrcmp(group_name, cache_rec->group_name))
continue;
sz = sizeof(uid_t) * (cache_rec->uid_cnt + 1);
- group_uids = (uid_t *) xmalloc(sz);
+ group_uids = xmalloc(sz);
memcpy(group_uids, cache_rec->group_uids, sz);
break;
}
@@ -295,7 +295,7 @@ static void _put_group_cache(char *group_name, void *group_uids, int uid_cnt)
cache_rec = xmalloc(sizeof(struct group_cache_rec));
cache_rec->group_name = xstrdup(group_name);
cache_rec->uid_cnt = uid_cnt;
- cache_rec->group_uids = (uid_t *) xmalloc(sizeof(uid_t) + sz);
+ cache_rec->group_uids = xmalloc(sizeof(uid_t) + sz);
if (uid_cnt > 0)
memcpy(cache_rec->group_uids, group_uids, sz);
list_append(group_cache_list, cache_rec);
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 286449327ba..e73bae70094 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -459,8 +459,8 @@ static job_array_resp_msg_t *_resp_array_xlate(resp_array_struct_t *resp,
*/
static struct job_record *_create_job_record(uint32_t num_jobs)
{
- struct job_record *job_ptr;
- struct job_details *detail_ptr;
+ struct job_record *job_ptr = xmalloc(sizeof(*job_ptr));
+ struct job_details *detail_ptr = xmalloc(sizeof(*detail_ptr));
if ((job_count + num_jobs) >= slurmctld_conf.max_job_cnt) {
error("%s: MaxJobCount limit from slurm.conf reached (%u)",
@@ -470,9 +470,6 @@ static struct job_record *_create_job_record(uint32_t num_jobs)
job_count += num_jobs;
last_job_update = time(NULL);
- job_ptr = (struct job_record *) xmalloc(sizeof(struct job_record));
- detail_ptr = (struct job_details *)xmalloc(sizeof(struct job_details));
-
job_ptr->magic = JOB_MAGIC;
job_ptr->array_task_id = NO_VAL;
job_ptr->details = detail_ptr;
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index d08e0a6dc81..158a1f6f92f 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -2447,7 +2447,7 @@ extern void launch_job(struct job_record *job_ptr)
if (launch_job_ptr->pack_job_id)
_set_pack_env(launch_job_ptr, launch_msg_ptr);
- agent_arg_ptr = (agent_arg_t *) xmalloc(sizeof(agent_arg_t));
+ agent_arg_ptr = xmalloc(sizeof(agent_arg_t));
agent_arg_ptr->protocol_version = protocol_version;
agent_arg_ptr->node_count = 1;
agent_arg_ptr->retry = 0;
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index d29e35dec56..f432a9f125b 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -3233,7 +3233,7 @@ extern void launch_prolog(struct job_record *job_ptr)
&cred_arg,
SLURM_PROTOCOL_VERSION);
- agent_arg_ptr = (agent_arg_t *) xmalloc(sizeof(agent_arg_t));
+ agent_arg_ptr = xmalloc(sizeof(agent_arg_t));
agent_arg_ptr->retry = 0;
#ifdef HAVE_FRONT_END
xassert(job_ptr->front_end_ptr);
diff --git a/src/slurmctld/partition_mgr.c b/src/slurmctld/partition_mgr.c
index 51e8f8d17f4..163e65ab414 100644
--- a/src/slurmctld/partition_mgr.c
+++ b/src/slurmctld/partition_mgr.c
@@ -297,12 +297,10 @@ static void _unlink_free_nodes(bitstr_t *old_bitmap,
*/
struct part_record *create_part_record(void)
{
- struct part_record *part_ptr;
+ struct part_record *part_ptr = xmalloc(sizeof(*part_ptr));
last_part_update = time(NULL);
- part_ptr = (struct part_record *) xmalloc(sizeof(struct part_record));
-
xassert (part_ptr->magic = PART_MAGIC); /* set value */
part_ptr->name = xstrdup("DEFAULT");
part_ptr->alternate = xstrdup(default_part.alternate);
diff --git a/src/slurmctld/srun_comm.c b/src/slurmctld/srun_comm.c
index 9a3cd765597..8701e840d97 100644
--- a/src/slurmctld/srun_comm.c
+++ b/src/slurmctld/srun_comm.c
@@ -390,7 +390,7 @@ extern int srun_user_message(struct job_record *job_ptr, char *msg)
#ifdef HAVE_FRONT_END
if (job_ptr->batch_host == NULL)
return ESLURM_DISABLED; /* no allocated nodes */
- agent_arg_ptr = (agent_arg_t *) xmalloc(sizeof(agent_arg_t));
+ agent_arg_ptr = xmalloc(sizeof(agent_arg_t));
agent_arg_ptr->hostlist = hostlist_create(job_ptr->batch_host);
if (!agent_arg_ptr->hostlist)
fatal("Invalid srun host: %s", job_ptr->batch_host);
@@ -403,7 +403,7 @@ extern int srun_user_message(struct job_record *job_ptr, char *msg)
node_ptr = find_first_node_record(job_ptr->node_bitmap);
if (node_ptr == NULL)
return ESLURM_DISABLED; /* no allocated nodes */
- agent_arg_ptr = (agent_arg_t *) xmalloc(sizeof(agent_arg_t));
+ agent_arg_ptr = xmalloc(sizeof(agent_arg_t));
agent_arg_ptr->hostlist = hostlist_create(node_ptr->name);
agent_arg_ptr->protocol_version = node_ptr->protocol_version;
if (!agent_arg_ptr->hostlist)
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index 03d71155f88..a8da403e846 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -178,7 +178,7 @@ static struct step_record * _create_step_record(struct job_record *job_ptr,
return NULL;
}
- step_ptr = (struct step_record *) xmalloc(sizeof(struct step_record));
+ step_ptr = xmalloc(sizeof(struct step_record));
last_job_update = time(NULL);
step_ptr->job_ptr = job_ptr;
--
GitLab