From ad9917a51421b5ccb1392480efc2c610b7e54c0a Mon Sep 17 00:00:00 2001
From: Nicolas Joly <njoly@pasteur.fr>
Date: Thu, 11 Dec 2014 12:02:51 -0800
Subject: [PATCH] fter commit b1c5716da63f which added support for NO_VAL in
slurmdb_purge_string(), there is no reason to check for this specific value
anymore in read_config().
---
src/slurmdbd/read_config.c | 36 ++++++++++--------------------------
1 file changed, 10 insertions(+), 26 deletions(-)
diff --git a/src/slurmdbd/read_config.c b/src/slurmdbd/read_config.c
index e6f011e6aaf..624b9218f36 100644
--- a/src/slurmdbd/read_config.c
+++ b/src/slurmdbd/read_config.c
@@ -567,42 +567,26 @@ extern void log_config(void)
private_data_string(slurmdbd_conf->private_data,
tmp_str, sizeof(tmp_str));
-
debug2("PrivateData = %s", tmp_str);
- if (slurmdbd_conf->purge_event != NO_VAL)
- slurmdb_purge_string(slurmdbd_conf->purge_event,
- tmp_str, sizeof(tmp_str), 1);
- else
- sprintf(tmp_str, "NONE");
+ slurmdb_purge_string(slurmdbd_conf->purge_event,
+ tmp_str, sizeof(tmp_str), 1);
debug2("PurgeEventAfter = %s", tmp_str);
- if (slurmdbd_conf->purge_job != NO_VAL)
- slurmdb_purge_string(slurmdbd_conf->purge_job,
- tmp_str, sizeof(tmp_str), 1);
- else
- sprintf(tmp_str, "NONE");
+ slurmdb_purge_string(slurmdbd_conf->purge_job,
+ tmp_str, sizeof(tmp_str), 1);
debug2("PurgeJobAfter = %s", tmp_str);
- if (slurmdbd_conf->purge_resv != NO_VAL)
- slurmdb_purge_string(slurmdbd_conf->purge_resv,
- tmp_str, sizeof(tmp_str), 1);
- else
- sprintf(tmp_str, "NONE");
+ slurmdb_purge_string(slurmdbd_conf->purge_resv,
+ tmp_str, sizeof(tmp_str), 1);
debug2("PurgeResvAfter = %s", tmp_str);
- if (slurmdbd_conf->purge_step != NO_VAL)
- slurmdb_purge_string(slurmdbd_conf->purge_step,
- tmp_str, sizeof(tmp_str), 1);
- else
- sprintf(tmp_str, "NONE");
+ slurmdb_purge_string(slurmdbd_conf->purge_step,
+ tmp_str, sizeof(tmp_str), 1);
debug2("PurgeStepAfter = %s", tmp_str);
- if (slurmdbd_conf->purge_suspend != NO_VAL)
- slurmdb_purge_string(slurmdbd_conf->purge_suspend,
- tmp_str, sizeof(tmp_str), 1);
- else
- sprintf(tmp_str, "NONE");
+ slurmdb_purge_string(slurmdbd_conf->purge_suspend,
+ tmp_str, sizeof(tmp_str), 1);
debug2("PurgeSuspendAfter = %s", tmp_str);
debug2("SlurmUser = %s(%u)",
--
GitLab