From 9ff49ca05047b648e3366b7de7187ac27e596f67 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Tue, 3 Feb 2009 00:22:57 +0000
Subject: [PATCH] set things to NO_VAL if not set
---
src/common/slurm_accounting_storage.c | 4 ++--
.../mysql/accounting_storage_mysql.c | 12 ++++--------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/common/slurm_accounting_storage.c b/src/common/slurm_accounting_storage.c
index 2938cf1f299..27f9c64056e 100644
--- a/src/common/slurm_accounting_storage.c
+++ b/src/common/slurm_accounting_storage.c
@@ -5666,8 +5666,8 @@ extern void pack_acct_reservation_rec(void *in, uint16_t rpc_version,
if(!object) {
packnull(buffer);
- pack32(0, buffer);
- pack16(0, buffer);
+ pack32((uint32_t)NO_VAL, buffer);
+ pack16((uint16_t)NO_VAL, buffer);
pack32(0, buffer);
packnull(buffer);
pack_time(0, buffer);
diff --git a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
index 8c503d113a3..ae700849409 100644
--- a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
+++ b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
@@ -878,17 +878,13 @@ static int _setup_resv_limits(acct_reservation_rec_t *resv,
{
/* strip off the action item from the flags */
- if(resv->cpus) {
+ if(resv->cpus != (uint32_t)NO_VAL) {
xstrcat(*cols, ", cpus");
xstrfmtcat(*vals, ", %u", resv->cpus);
xstrfmtcat(*extra, ", cpus=%u", resv->cpus);
}
- /* if(resv->flags & RESERVE_FLAG_CLEAR) { */
-/* xstrcat(*cols, ", flags"); */
-/* xstrcat(*vals, ", 0"); */
-/* xstrcat(*extra, ", flags=0"); */
-/* } else */if(resv->flags) {
+ if(resv->flags != (uint16_t)NO_VAL) {
xstrcat(*cols, ", flags");
xstrfmtcat(*vals, ", %u", resv->flags);
xstrfmtcat(*extra, ", flags=%u", resv->flags);
@@ -5937,12 +5933,12 @@ try_again:
/* check differences here */
- if(!resv->cpus) {
+ if(resv->cpus == (uint32_t)NO_VAL) {
resv->cpus = atoi(row[RESV_CPU]);
set = 1;
}
- if(!resv->flags) {
+ if(resv->flags == (uint16_t)NO_VAL) {
resv->flags = atoi(row[RESV_FLAGS]);
set = 1;
}
--
GitLab