From eccd7d37ca9de3c6388ca065fd02670c764ba5f6 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 6 Oct 2003 23:41:55 +0000
Subject: [PATCH] Restructure code to eliminate warning error. No change in
logic.
---
src/common/qsw.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/common/qsw.c b/src/common/qsw.c
index 5a30c8342d2..2483a3670d0 100644
--- a/src/common/qsw.c
+++ b/src/common/qsw.c
@@ -100,17 +100,19 @@ struct qsw_jobinfo {
/* Copy library state */
#define _copy_libstate(dest, src) do { \
assert((src)->ls_magic == QSW_LIBSTATE_MAGIC); \
- assert((dest)->ls_magic == QSW_LIBSTATE_MAGIC); \
+ assert((dest)->ls_magic == QSW_LIBSTATE_MAGIC); \
memcpy(dest, src, sizeof(struct qsw_libstate)); \
} while (0)
/* Lock on library state */
#define _lock_qsw() do { \
- int err = pthread_mutex_lock(&qsw_lock); \
+ int err; \
+ err = pthread_mutex_lock(&qsw_lock); \
assert(err == 0); \
} while (0)
#define _unlock_qsw() do { \
- int err = pthread_mutex_unlock(&qsw_lock); \
+ int err; \
+ err = pthread_mutex_unlock(&qsw_lock); \
assert(err == 0); \
} while (0)
--
GitLab