diff --git a/src/common/layouts_mgr.c b/src/common/layouts_mgr.c
index 95eaf5583768bbbf03aaeb502d798b628703d9b4..7d6e0825532b6549657f9b7c245e9e772b5f00b4 100644
--- a/src/common/layouts_mgr.c
+++ b/src/common/layouts_mgr.c
@@ -47,15 +47,15 @@
#include "slurm/slurm.h"
#include "slurm/slurm_errno.h"
+#include "src/common/hostlist.h"
#include "src/common/list.h"
-#include "src/common/xtree.h"
-#include "src/common/xmalloc.h"
+#include "src/common/node_conf.h"
#include "src/common/plugin.h"
-#include "src/common/xstring.h"
-#include "src/common/slurm_protocol_api.h"
#include "src/common/read_config.h"
-#include "src/common/node_conf.h"
-#include "src/common/hostlist.h"
+#include "src/common/slurm_protocol_api.h"
+#include "src/common/xstring.h"
+#include "src/common/xtree.h"
+#include "src/common/xmalloc.h"
#define PATHLEN 256
@@ -1055,7 +1055,7 @@ static void _dump_layouts(void* item, void* arg)
* SLURM LAYOUTS API *
\*****************************************************************************/
-int slurm_layouts_init()
+int slurm_layouts_init(void)
{
int i = 0;
uint32_t layouts_count;
@@ -1100,7 +1100,7 @@ int slurm_layouts_init()
SLURM_SUCCESS : SLURM_ERROR;
}
-int slurm_layouts_fini()
+int slurm_layouts_fini(void)
{
int i;
@@ -1123,7 +1123,7 @@ int slurm_layouts_fini()
return SLURM_SUCCESS;
}
-int slurm_layouts_load_config()
+int slurm_layouts_load_config(void)
{
int i, rc, inx;
struct node_record *node_ptr;
@@ -1176,7 +1176,7 @@ int slurm_layouts_load_config()
}
/* add to the base layout (storing a callback ref to the
- layout node pointing to it) */
+ * layout node pointing to it) */
ptr = xtree_add_child(layout->tree, layout->tree->root,
(void*)entity, XTREE_APPEND);
if (!ptr) {
diff --git a/src/common/layouts_mgr.h b/src/common/layouts_mgr.h
index 51d997e3bbed2cab2de9e861ea6f09772c056860..357ab5f19bc032ceca31d9a58d81dad6a8c58418 100644
--- a/src/common/layouts_mgr.h
+++ b/src/common/layouts_mgr.h
@@ -115,13 +115,13 @@ typedef struct layouts_plugin_spec_st {
* slurm_layouts_load_config()
*
*/
-int slurm_layouts_init();
+int slurm_layouts_init(void);
/*
* slurm_layouts_fini - uninitialize the layouts mgr and free the internal
* hash tables.
*/
-int slurm_layouts_fini();
+int slurm_layouts_fini(void);
/*
* slurm_layouts_load_config - use the layouts plugins details loaded during
@@ -132,7 +132,7 @@ int slurm_layouts_fini();
* Return SLURM_SUCCESS or SLURM_ERROR if all the required layouts were not
* loaded correctly.
*/
-int slurm_layouts_load_config();
+int slurm_layouts_load_config(void);
/*
* slurm_layouts_get_layout - return the layout from a given type
diff --git a/src/common/parse_config.c b/src/common/parse_config.c
index 5a0e19d089bd8c74c24086a2aa5b1fe2763b695d..c06908324181065968353e2231fe5a6e7a4bb0f8 100644
--- a/src/common/parse_config.c
+++ b/src/common/parse_config.c
@@ -52,16 +52,14 @@
#include <stdlib.h>
#include <unistd.h>
-/* #include "src/common/slurm_protocol_defs.h" */
+#include "src/common/hostlist.h"
#include "src/common/log.h"
#include "src/common/macros.h"
+#include "src/common/parse_config.h"
+#include "src/common/parse_value.h"
#include "src/common/xmalloc.h"
#include "src/common/xstring.h"
#include "src/common/xassert.h"
-#include "src/common/parse_value.h"
-/* #include "src/common/slurm_rlimits_info.h" */
-#include "src/common/parse_config.h"
-#include "src/common/hostlist.h"
#include "slurm/slurm.h"
diff --git a/src/common/read_config.c b/src/common/read_config.c
index 27246f4ddc721d5011629804f157e87eb1899b84..75c5fbbb33a76c65013d18f7115e618ea5362d8a 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -240,6 +240,7 @@ s_p_options_t slurm_conf_options[] = {
{"KillOnBadExit", S_P_UINT16},
{"KillWait", S_P_UINT16},
{"LaunchType", S_P_STRING},
+ {"Layouts", S_P_STRING},
{"Licenses", S_P_STRING},
{"LogTimeFormat", S_P_STRING},
{"MailProg", S_P_STRING},
@@ -350,7 +351,6 @@ s_p_options_t slurm_conf_options[] = {
{"PartitionName", S_P_ARRAY, _parse_partitionname,
_destroy_partitionname},
{"DownNodes", S_P_ARRAY, _parse_downnodes, _destroy_downnodes},
- {"Layouts", S_P_STRING},
{NULL}
};
@@ -2292,6 +2292,7 @@ free_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr, bool purge_node_hash)
xfree (ctl_conf_ptr->job_credential_public_certificate);
xfree (ctl_conf_ptr->job_submit_plugins);
xfree (ctl_conf_ptr->launch_type);
+ xfree (ctl_conf_ptr->layouts);
xfree (ctl_conf_ptr->licenses);
xfree (ctl_conf_ptr->licenses_used);
xfree (ctl_conf_ptr->mail_prog);
@@ -2348,7 +2349,6 @@ free_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr, bool purge_node_hash)
xfree (ctl_conf_ptr->unkillable_program);
xfree (ctl_conf_ptr->version);
xfree (ctl_conf_ptr->z_char);
- xfree (ctl_conf_ptr->layouts);
if (purge_node_hash)
_free_name_hashtbl();
@@ -2424,8 +2424,10 @@ init_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr)
ctl_conf_ptr->job_requeue = (uint16_t) NO_VAL;
xfree(ctl_conf_ptr->job_submit_plugins);
ctl_conf_ptr->keep_alive_time = (uint16_t) NO_VAL;
+ ctl_conf_ptr->kill_on_bad_exit = 0;
ctl_conf_ptr->kill_wait = (uint16_t) NO_VAL;
xfree (ctl_conf_ptr->launch_type);
+ xfree (ctl_conf_ptr->layouts);
xfree (ctl_conf_ptr->licenses);
xfree (ctl_conf_ptr->mail_prog);
ctl_conf_ptr->max_array_sz = (uint32_t) NO_VAL;
@@ -2517,8 +2519,6 @@ init_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr)
ctl_conf_ptr->use_spec_resources = 0;
ctl_conf_ptr->vsize_factor = 0;
ctl_conf_ptr->wait_time = (uint16_t) NO_VAL;
- ctl_conf_ptr->kill_on_bad_exit = 0;
- xfree (ctl_conf_ptr->layouts);
_free_name_hashtbl();
_init_name_hashtbl();