From 174363d111833a740e641ffef0fce3b1d57c5e47 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Wed, 26 Jun 2002 20:03:37 +0000
Subject: [PATCH] Change unpack_ptr to unpack_xmalloc to match xfree call.
---
src/common/slurm_protocol_pack.c | 2 +-
src/slurmctld/controller.c | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index 4554aa395d8..412c2e52556 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -567,7 +567,7 @@ int unpack_job_table ( job_table_t * job , void ** buf_ptr , int * buffer_size )
unpack32 (&job->min_tmp_disk, buf_ptr, buffer_size);
unpackstr_xmalloc (&job->req_nodes, &uint16_tmp, buf_ptr, buffer_size);
- unpackstr_ptr (&node_inx_str, &uint16_tmp, buf_ptr, buffer_size);
+ unpackstr_xmalloc (&node_inx_str, &uint16_tmp, buf_ptr, buffer_size);
if (node_inx_str == NULL)
job->req_node_inx = bitfmt2int("");
else {
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index 3de62adfd3e..dce2777144a 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -235,7 +235,7 @@ slurm_rpc_dump_build ( slurm_msg_t * msg )
}
}
-/* DumpJob - dump the Job configurations */
+/* slurm_rpc_dump_jobs - dump the descriptors for all jobs */
void
slurm_rpc_dump_jobs ( slurm_msg_t * msg )
{
@@ -482,7 +482,7 @@ slurm_rpc_submit_batch_job ( slurm_msg_t * msg )
schedule();
}
-/* Allocate: allocate resources for a job */
+/* slurm_rpc_allocate_resources: allocate resources for a job */
void slurm_rpc_allocate_resources ( slurm_msg_t * msg , uint8_t immediate )
{
/* init */
@@ -520,7 +520,7 @@ void slurm_rpc_allocate_resources ( slurm_msg_t * msg , uint8_t immediate )
xfree ( alloc_msg );
}
-/* JobWillRun - determine if job with given configuration can be initiated now */
+/* slurm_rpc_job_will_run - determine if job with given configuration can be initiated now */
void slurm_rpc_job_will_run ( slurm_msg_t * msg )
{
/* init */
@@ -552,7 +552,6 @@ void slurm_rpc_job_will_run ( slurm_msg_t * msg )
}
-
/* Reconfigure - re-initialized from configuration files */
void
slurm_rpc_reconfigure_controller ( slurm_msg_t * msg )
--
GitLab