From 818f351f43d91a8db0ac7385abaa4069a7b980f9 Mon Sep 17 00:00:00 2001
From: tewk <tewk@unknown>
Date: Tue, 9 Jul 2002 20:35:04 +0000
Subject: [PATCH] Fixed duplicate #defines, spelling error, etc.
---
src/common/slurm_protocol_api.c | 5 +++--
src/common/slurm_protocol_defs.h | 4 ++--
src/common/slurm_protocol_errno.c | 9 +++++++++
src/common/slurm_protocol_errno.h | 5 ++++-
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index 2283bb74e8e..5cd9452d488 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -19,6 +19,7 @@
/* #DEFINES */
/* STATIC VARIABLES */
+/* default
static slurm_protocol_config_t proto_conf_default ;
static slurm_protocol_config_t * proto_conf = & proto_conf_default ;
@@ -46,10 +47,10 @@ int slurm_api_set_default_config ( )
return SLURM_SUCCESS ;
}
-int slurm_set_default_controllers ( char * primary_controller_hostname , char * secondary_controller_hostnme, uint16_t pri_port , uint16_t sec_port )
+int slurm_set_default_controllers ( char * primary_controller_hostname , char * secondary_controller_hostname, uint16_t pri_port , uint16_t sec_port )
{
slurm_set_addr ( & proto_conf_default . primary_controller , pri_port , primary_controller_hostname ) ;
- slurm_set_addr ( & proto_conf_default . secondary_controller , sec_port , secondary_controller_hostnme ) ;
+ slurm_set_addr ( & proto_conf_default . secondary_controller , sec_port , secondary_controller_hostname ) ;
return SLURM_SUCCESS ;
}
diff --git a/src/common/slurm_protocol_defs.h b/src/common/slurm_protocol_defs.h
index 3c1dab71bad..447bc3bcc80 100644
--- a/src/common/slurm_protocol_defs.h
+++ b/src/common/slurm_protocol_defs.h
@@ -118,8 +118,8 @@ typedef enum { test1, test2
#define RESPONSE_BATCH_JOB_LAUNCH 4022
#define REQUEST_SIGNAL_JOB 4031
#define RESPONSE_SIGNAL_JOB 4032
-#define REQUEST_CANCEL_JOB_STEP 4041
-#define RESPONSE_CANCEL_JOB_STEP 4042
+#define REQUEST_CANCEL_JOB 4041
+#define RESPONSE_CANCEL_JOB 4042
#define REQUEST_JOB_RESOURCE 4051
#define RESPONSE_JOB_RESOURCE 4052
#define REQUEST_JOB_ATTACH 4061
diff --git a/src/common/slurm_protocol_errno.c b/src/common/slurm_protocol_errno.c
index e0af28ce30a..82ab32fcfe0 100644
--- a/src/common/slurm_protocol_errno.c
+++ b/src/common/slurm_protocol_errno.c
@@ -85,6 +85,15 @@ slurm_strerror(int errnum)
return (res ? res : strerror(errnum));
}
+/*
+ * Get errno
+ */
+int
+slurm_get_errno()
+{
+ return errno ;
+}
+
/*
* Set errno to the specified value.
*/
diff --git a/src/common/slurm_protocol_errno.h b/src/common/slurm_protocol_errno.h
index 9a24bed0ea4..090e110f512 100644
--- a/src/common/slurm_protocol_errno.h
+++ b/src/common/slurm_protocol_errno.h
@@ -49,7 +49,7 @@
#define ESLURM_ACCESS_DENIED -2202
/* step_mgr.c */
-#define ESLURM_ACCESS_DENIED -2301
+/* already defined above #define ESLURM_ACCESS_DENIED -2301 */
/* look up an errno value */
extern char * slurm_strerror(int errnum);
@@ -57,6 +57,9 @@ extern char * slurm_strerror(int errnum);
/* set an errno value */
extern void slurm_seterrno(int errnum);
+/* set an errno value */
+extern inline int slurm_get_errno();
+
/* print message: error string for current errno value */
extern void slurm_perror(char *msg);
--
GitLab