From 047f6a50a3a05bdcb4da692f45ecb7f1727b4b13 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 10 Mar 2011 18:23:13 +0000
Subject: [PATCH] revert last change
---
src/sview/block_info.c | 2 --
src/sview/job_info.c | 4 ++--
src/sview/node_info.c | 3 +--
src/sview/part_info.c | 4 ++--
src/sview/resv_info.c | 4 ++--
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/sview/block_info.c b/src/sview/block_info.c
index cc0185ba144..8db14a741bc 100644
--- a/src/sview/block_info.c
+++ b/src/sview/block_info.c
@@ -517,8 +517,6 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
return NULL;
}
for (i=0; i<block_info_ptr->record_count; i++) {
- if (!block_info_ptr->block_array[i])
- break;
block_ptr = xmalloc(sizeof(sview_block_info_t));
block_ptr->bg_block_name
diff --git a/src/sview/job_info.c b/src/sview/job_info.c
index 6f19bb314fc..ab0ece159e6 100644
--- a/src/sview/job_info.c
+++ b/src/sview/job_info.c
@@ -2467,8 +2467,8 @@ static List _create_job_info_list(job_info_msg_t *job_info_ptr,
}
for(i=0; i<job_info_ptr->record_count; i++) {
- if (!(job_ptr = &(job_info_ptr->job_array[i])))
- break;
+ job_ptr = &(job_info_ptr->job_array[i]);
+
sview_job_info_ptr = xmalloc(sizeof(sview_job_info_t));
sview_job_info_ptr->job_ptr = job_ptr;
sview_job_info_ptr->step_list = list_create(NULL);
diff --git a/src/sview/node_info.c b/src/sview/node_info.c
index 9aaa99756de..0ae9209db88 100644
--- a/src/sview/node_info.c
+++ b/src/sview/node_info.c
@@ -628,8 +628,7 @@ extern List create_node_info_list(node_info_msg_t *node_info_ptr,
}
for (i=0; i<node_info_ptr->record_count; i++) {
- if (!(node_ptr = &(node_info_ptr->node_array[i])))
- break;
+ node_ptr = &(node_info_ptr->node_array[i]);
if (!node_ptr->name || (node_ptr->name[0] == '\0'))
continue;
diff --git a/src/sview/part_info.c b/src/sview/part_info.c
index 3da7a515d84..0f7b5770c18 100644
--- a/src/sview/part_info.c
+++ b/src/sview/part_info.c
@@ -1574,8 +1574,8 @@ static List _create_part_info_list(partition_info_msg_t *part_info_ptr,
}
for (i=0; i<part_info_ptr->record_count; i++) {
- if (!(part_ptr = &(part_info_ptr->partition_array[i])))
- break;
+ part_ptr = &(part_info_ptr->partition_array[i]);
+
/* don't include configured excludes */
if (!working_sview_config.show_hidden &&
part_ptr->flags & PART_FLAG_HIDDEN)
diff --git a/src/sview/resv_info.c b/src/sview/resv_info.c
index a01bd82d116..3187bacba30 100644
--- a/src/sview/resv_info.c
+++ b/src/sview/resv_info.c
@@ -711,8 +711,8 @@ static List _create_resv_info_list(reserve_info_msg_t *resv_info_ptr,
}
for(i=0; i<resv_info_ptr->record_count; i++) {
- if (!(resv_ptr = &(resv_info_ptr->reservation_array[i])))
- break;
+ resv_ptr = &(resv_info_ptr->reservation_array[i]);
+
sview_resv_info_ptr = xmalloc(sizeof(sview_resv_info_t));
sview_resv_info_ptr->resv_ptr = resv_ptr;
sview_resv_info_ptr->color_inx = i % sview_colors_cnt;
--
GitLab