From 94fec6ad8ce5a532841a339b35dd9439c2dc5b99 Mon Sep 17 00:00:00 2001 From: Alexander A Oganezov Date: Thu, 13 Jun 2024 16:10:10 +0000 Subject: [PATCH 1/2] DAOS-16020 cart: Fix bad macro - fix bad crt_env_get() macro that incorrectly expanded in single line statements Required-githooks: true Signed-off-by: Alexander A Oganezov --- src/cart/crt_internal_types.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cart/crt_internal_types.h b/src/cart/crt_internal_types.h index bfa2e5f5b39..f397e25bf11 100644 --- a/src/cart/crt_internal_types.h +++ b/src/cart/crt_internal_types.h @@ -294,9 +294,11 @@ crt_env_fini(void) /* Returns value if env was present at load time */ #define crt_env_get(name, val) \ +do { \ D_ASSERT(crt_genvs.inited); \ if (crt_genvs._rc_##name == 0) \ - *val = crt_genvs._##name; + *val = crt_genvs._##name; \ +} while (0) static inline void crt_env_dump(void) From cde9d009c8b8f87f594b396ea7ed175be4336ca3 Mon Sep 17 00:00:00 2001 From: Alexander A Oganezov Date: Thu, 13 Jun 2024 16:12:03 +0000 Subject: [PATCH 2/2] clang Required-githooks: true Signed-off-by: Alexander A Oganezov --- src/cart/crt_internal_types.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cart/crt_internal_types.h b/src/cart/crt_internal_types.h index f397e25bf11..acda4ccd40e 100644 --- a/src/cart/crt_internal_types.h +++ b/src/cart/crt_internal_types.h @@ -294,11 +294,11 @@ crt_env_fini(void) /* Returns value if env was present at load time */ #define crt_env_get(name, val) \ -do { \ - D_ASSERT(crt_genvs.inited); \ - if (crt_genvs._rc_##name == 0) \ - *val = crt_genvs._##name; \ -} while (0) + do { \ + D_ASSERT(crt_genvs.inited); \ + if (crt_genvs._rc_##name == 0) \ + *val = crt_genvs._##name; \ + } while (0) static inline void crt_env_dump(void)