From daa2c84524bba0f4f25c3eab3e484d6bb2426e90 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Tue, 6 Nov 2007 18:28:37 +0000
Subject: [PATCH] fixes for warnings
---
src/plugins/select/cons_res/select_cons_res.c | 2 +-
src/slurmctld/node_scheduler.c | 2 +-
src/slurmctld/node_scheduler.h | 2 +-
src/slurmd/slurmd/read_proc.c | 6 +++---
src/sview/block_info.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index 314b0f5b128..9d06f42d8ad 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -567,7 +567,7 @@ static void _append_to_job_list(struct select_cr_job *new_job)
/*
* _count_cpus - report how many cpus are available with the identified nodes
*/
-static void _count_cpus(unsigned *bitmap, uint16_t *sum)
+static void _count_cpus(bitstr_t *bitmap, uint16_t *sum)
{
int i, allocated_lps;
*sum = 0;
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index 06aaea774b8..9c3b0980c75 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -141,7 +141,7 @@ extern void allocate_nodes(struct job_record *job_ptr)
* globals: node_record_count - number of nodes configured
* node_record_table_ptr - pointer to global node table
*/
-extern int count_cpus(unsigned *bitmap)
+extern int count_cpus(bitstr_t *bitmap)
{
int i, sum;
diff --git a/src/slurmctld/node_scheduler.h b/src/slurmctld/node_scheduler.h
index 7febc9ad74a..d44fa4eff0c 100644
--- a/src/slurmctld/node_scheduler.h
+++ b/src/slurmctld/node_scheduler.h
@@ -61,7 +61,7 @@ extern void build_node_details(struct job_record *job_ptr);
* globals: node_record_count - number of nodes configured
* node_record_table_ptr - pointer to global node table
*/
-extern int count_cpus(unsigned *bitmap);
+extern int count_cpus(bitstr_t *bitmap);
/*
* deallocate_nodes - for a given job, deallocate its nodes and make
diff --git a/src/slurmd/slurmd/read_proc.c b/src/slurmd/slurmd/read_proc.c
index 5ed4ca0a16a..78b44f449ff 100644
--- a/src/slurmd/slurmd/read_proc.c
+++ b/src/slurmd/slurmd/read_proc.c
@@ -77,7 +77,7 @@ struct sess_record *session_ptr;
int dump_proc(int uid, int sid);
void init_proc(void);
int parse_proc_stat(char* proc_stat, int *session,
- long unsigned *time, long *resident_set_size);
+ unsigned long *time, long *resident_set_size);
int read_proc();
#if DEBUG_MODULE
@@ -178,7 +178,7 @@ init_proc (void)
* RET - zero or errno code
*/
int
-parse_proc_stat(char* proc_stat, int *session, long unsigned *time,
+parse_proc_stat(char* proc_stat, int *session, unsigned long *time,
long *resident_set_size) {
int pid, ppid, pgrp, tty, tpgid;
char cmd[16], state[1];
@@ -239,7 +239,7 @@ read_proc()
struct stat buffer;
int uid, session;
long resident_set_size;
- long unsigned time;
+ unsigned long time;
struct sess_record *s_ptr, *sess_free;
/* Initialization */
diff --git a/src/sview/block_info.c b/src/sview/block_info.c
index 47654ea7f6d..6e4251b6cab 100644
--- a/src/sview/block_info.c
+++ b/src/sview/block_info.c
@@ -350,7 +350,7 @@ static void _update_info_block(List block_list,
if(block_ptr->node_cnt == 0)
block_ptr->node_cnt = block_ptr->size;
if(!block_ptr->slurm_part_name)
- block_ptr->slurm_part_name = "no part";
+ block_ptr->slurm_part_name = xstrdup("no part");
/* get the iter, or find out the list is empty goto add */
if (!gtk_tree_model_get_iter(model, &iter, path)) {
--
GitLab