From 46e1772ff84bbd5a4da4f07cf31f649df3b05613 Mon Sep 17 00:00:00 2001
From: Mark Grondona <mgrondona@llnl.gov>
Date: Wed, 22 May 2002 22:18:44 +0000
Subject: [PATCH] o adjusted includes after removal of bits_bytes.[ch] and
common/slurm*.h
---
src/slurmctld/controller.c | 2 +-
src/slurmctld/job_mgr.c | 2 +-
src/slurmctld/job_scheduler.c | 2 +-
src/slurmctld/node_mgr.c | 2 +-
src/slurmctld/node_scheduler.c | 2 +-
src/slurmctld/partition_mgr.c | 2 +-
src/slurmctld/read_config.c | 31 ++++++++++++++++++++++++++++++-
src/slurmctld/step_mgr.c | 2 +-
8 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index fdd83f80b39..f5f1871c069 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -21,7 +21,7 @@
#include <netinet/in.h>
#include <unistd.h>
-#include "slurm.h"
+#include "slurmctld.h"
#include "pack.h"
#define BUF_SIZE 1024
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index d9639623b58..c14e3189573 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -17,7 +17,7 @@
#include "list.h"
#include "pack.h"
-#include "slurm.h"
+#include "slurmctld.h"
#define BUF_SIZE 1024
#define MAX_STR_PACK 128
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index a70ad24b224..8f3d6405687 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -14,7 +14,7 @@
#include <string.h>
#include "list.h"
-#include "slurm.h"
+#include "slurmctld.h"
struct job_queue {
int priority;
diff --git a/src/slurmctld/node_mgr.c b/src/slurmctld/node_mgr.c
index 61b6bf90794..7528ed47477 100644
--- a/src/slurmctld/node_mgr.c
+++ b/src/slurmctld/node_mgr.c
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <string.h>
-#include "slurm.h"
+#include "slurmctld.h"
#define BUF_SIZE 1024
#define SEPCHARS " \n\t"
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index 90d73ea3915..eb4ee43b320 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -18,7 +18,7 @@
#include <string.h>
#include <syslog.h>
-#include "slurm.h"
+#include "slurmctld.h"
#define BUF_SIZE 1024
diff --git a/src/slurmctld/partition_mgr.c b/src/slurmctld/partition_mgr.c
index 7edf0d91e95..9d1b52069c0 100644
--- a/src/slurmctld/partition_mgr.c
+++ b/src/slurmctld/partition_mgr.c
@@ -16,7 +16,7 @@
#include <string.h>
#include "list.h"
-#include "slurm.h"
+#include "slurmctld.h"
#define BUF_SIZE 1024
#define SEPCHARS " \n\t"
diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c
index 6a99ad33d2e..6bcc51ad9c9 100644
--- a/src/slurmctld/read_config.c
+++ b/src/slurmctld/read_config.c
@@ -20,7 +20,7 @@
#include <syslog.h>
#include <unistd.h>
-#include "slurm.h"
+#include "slurmctld.h"
#include "list.h"
#define BUF_SIZE 1024
@@ -30,6 +30,7 @@ int parse_part_spec (char *in_line);
char *backup_controller = NULL;
char *control_machine = NULL;
+int node_record_count = 0;
#if DEBUG_MODULE
/* main is used here for module testing purposes only */
@@ -149,6 +150,34 @@ main (int argc, char *argv[]) {
#endif
+/*
+ * report_leftover - report any un-parsed (non-whitespace) characters on the
+ * configuration input line.
+ * input: in_line - what is left of the configuration input line.
+ * line_num - line number of the configuration file.
+ * output: none
+ */
+static void
+report_leftover (char *in_line, int line_num)
+{
+ int bad_index, i;
+
+ bad_index = -1;
+ for (i = 0; i < strlen (in_line); i++) {
+ if (isspace ((int) in_line[i]) || (in_line[i] == '\n'))
+ continue;
+ bad_index = i;
+ break;
+ }
+
+ if (bad_index == -1)
+ return;
+ error ("report_leftover: ignored input on line %d of configuration: %s",
+ line_num, &in_line[bad_index]);
+ return;
+}
+
+
/*
* build_bitmaps - build node bitmaps to define which nodes are in which
* 1) partition 2) configuration record 3) up state 4) idle state
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index c61ae7f3259..d55d76af5a4 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -17,7 +17,7 @@
#include "list.h"
#include "pack.h"
-#include "slurm.h"
+#include "slurmctld.h"
#define BUF_SIZE 1024
--
GitLab