From a5d8c390370eb1342e9a542ffcd99bf9bfedca7c Mon Sep 17 00:00:00 2001
From: Mark Grondona <mgrondona@llnl.gov>
Date: Thu, 20 May 2004 23:17:16 +0000
Subject: [PATCH] o change prototypes and remove code to suppress warnings
---
src/srun/allocate.c | 3 ++-
src/srun/allocate.h | 2 +-
src/srun/env.c | 2 +-
src/srun/launch.c | 5 -----
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/srun/allocate.c b/src/srun/allocate.c
index b63c6624590..7b27730f482 100644
--- a/src/srun/allocate.c
+++ b/src/srun/allocate.c
@@ -40,6 +40,7 @@
#include "src/srun/allocate.h"
#include "src/srun/msg.h"
#include "src/srun/opt.h"
+#include "src/srun/env.h"
#include "src/srun/attach.h"
#define MAX_ALLOC_WAIT 60 /* seconds */
@@ -214,7 +215,7 @@ _intr_handler(int signo)
* (see opt.h)
*/
job_desc_msg_t *
-job_desc_msg_create_from_opts (const char *script)
+job_desc_msg_create_from_opts (char *script)
{
extern char **environ;
job_desc_msg_t *j = xmalloc(sizeof(*j));
diff --git a/src/srun/allocate.h b/src/srun/allocate.h
index 4b8da6d0fc4..2eef790161a 100644
--- a/src/srun/allocate.h
+++ b/src/srun/allocate.h
@@ -47,7 +47,7 @@ resource_allocation_response_msg_t * allocate_nodes(void);
* (see opt.h), if script != NULL then this is a batch job.
* The resulting memory must be freed with job_desc_msg_destroy()
*/
-job_desc_msg_t * job_desc_msg_create_from_opts (const char *script);
+job_desc_msg_t * job_desc_msg_create_from_opts (char *script);
/*
* Destroy (free memory from) a job_desc_msg_t object allocated with
diff --git a/src/srun/env.c b/src/srun/env.c
index 96305a117c0..38ab8bd4068 100644
--- a/src/srun/env.c
+++ b/src/srun/env.c
@@ -37,7 +37,7 @@ setenvf(const char *fmt, ...)
* Return the number of elements in the environment `env'
*/
int
-envcount (const char **env)
+envcount (char **env)
{
int envc = 0;
while (env[envc] != NULL)
diff --git a/src/srun/launch.c b/src/srun/launch.c
index 1f1600c7ace..43c60e89913 100644
--- a/src/srun/launch.c
+++ b/src/srun/launch.c
@@ -254,11 +254,6 @@ static int _wait_on_active(thd_t *thd, job_t *job)
return rc;
}
-static void _alrm_handler(int signo)
-{
- return;
-}
-
/* _p_launch - parallel (multi-threaded) task launcher */
static void _p_launch(slurm_msg_t *req, job_t *job)
{
--
GitLab