From e2610197555f7228f4704cea32a8556eb5923dbd Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 6 Jun 2005 16:56:38 +0000
Subject: [PATCH] Replace some "if(x) xfree(x);" logic with just "xfree(x);"
---
src/plugins/select/bluegene/bgl_job_run.c | 3 +--
src/plugins/select/bluegene/bluegene.c | 15 +++++----------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/plugins/select/bluegene/bgl_job_run.c b/src/plugins/select/bluegene/bgl_job_run.c
index b3f450fb3d9..fd1c70d346c 100644
--- a/src/plugins/select/bluegene/bgl_job_run.c
+++ b/src/plugins/select/bluegene/bgl_job_run.c
@@ -308,8 +308,7 @@ static void _start_agent(bgl_update_t *bgl_update_ptr)
slurm_mutex_lock(&part_state_mutex);
bgl_record->boot_count = 0;
- if(bgl_record->target_name)
- xfree(bgl_record->target_name);
+ xfree(bgl_record->target_name);
bgl_record->target_name = xstrdup(uid_to_string(bgl_update_ptr->uid));
debug("setting the target_name for Partition %s to %s",
bgl_record->bgl_part_id,
diff --git a/src/plugins/select/bluegene/bluegene.c b/src/plugins/select/bluegene/bluegene.c
index d80a2f047f3..6cdcdbdc713 100644
--- a/src/plugins/select/bluegene/bluegene.c
+++ b/src/plugins/select/bluegene/bluegene.c
@@ -176,20 +176,16 @@ extern void destroy_bgl_record(void* object)
bgl_record_t* bgl_record = (bgl_record_t*) object;
if (bgl_record) {
- if(bgl_record->nodes)
- xfree(bgl_record->nodes);
- if(bgl_record->user_name)
- xfree(bgl_record->user_name);
- if(bgl_record->target_name)
- xfree(bgl_record->target_name);
+ xfree(bgl_record->nodes);
+ xfree(bgl_record->user_name);
+ xfree(bgl_record->target_name);
if(bgl_record->bgl_part_list)
list_destroy(bgl_record->bgl_part_list);
if(bgl_record->hostlist)
hostlist_destroy(bgl_record->hostlist);
if(bgl_record->bitmap)
bit_free(bgl_record->bitmap);
- if(bgl_record->bgl_part_id)
- xfree(bgl_record->bgl_part_id);
+ xfree(bgl_record->bgl_part_id);
xfree(bgl_record);
}
@@ -1485,8 +1481,7 @@ static int _parse_bgl_spec(char *in_line)
else
bgl_record->conn_type = SELECT_MESH;
- if (conn_type)
- xfree(conn_type);
+ xfree(conn_type);
bgl_record->node_use = SELECT_COPROCESSOR_MODE;
--
GitLab