From b1c5716da63fb97a2eadc4506e360b922b43a86f Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Tue, 14 Oct 2014 10:08:37 -0700
Subject: [PATCH] Print NONE for slurmdb_purge_string if purge == NO_VAL.
addition to commit 9b00f12cbe5
---
src/common/slurmdb_defs.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/common/slurmdb_defs.c b/src/common/slurmdb_defs.c
index d094b91588c..d50a728e2c1 100644
--- a/src/common/slurmdb_defs.c
+++ b/src/common/slurmdb_defs.c
@@ -2158,8 +2158,14 @@ extern uint32_t slurmdb_parse_purge(char *string)
extern char *slurmdb_purge_string(uint32_t purge, char *string, int len,
bool with_archive)
{
- uint32_t units = SLURMDB_PURGE_GET_UNITS(purge);
+ uint32_t units;
+ if (purge == NO_VAL) {
+ snprintf(string, len, "NONE");
+ return string;
+ }
+
+ units = SLURMDB_PURGE_GET_UNITS(purge);
if (SLURMDB_PURGE_IN_HOURS(purge)) {
if (with_archive && SLURMDB_PURGE_ARCHIVE_SET(purge))
snprintf(string, len, "%u hours*", units);
--
GitLab