From 3edc71ec043865c735cc7cd67df1c0e211fa97dd Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 7 Oct 2022 16:06:59 +0200 Subject: [PATCH] Convert macros to static inline functions (rel.h) Reviewed-by: Amul Sul Discussion: https://www.postgresql.org/message-id/flat/5b558da8-99fb-0a99-83dd-f72f05388517%40enterprisedb.com --- src/include/utils/rel.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 7dc401cf0d..f383a2fca9 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -572,22 +572,21 @@ RelationGetSmgr(Relation rel) smgrsetowner(&(rel->rd_smgr), smgropen(rel->rd_locator, rel->rd_backend)); return rel->rd_smgr; } -#endif /* * RelationCloseSmgr * Close the relation at the smgr level, if not already done. - * - * Note: smgrclose should unhook from owner pointer, hence the Assert. */ -#define RelationCloseSmgr(relation) \ - do { \ - if ((relation)->rd_smgr != NULL) \ - { \ - smgrclose((relation)->rd_smgr); \ - Assert((relation)->rd_smgr == NULL); \ - } \ - } while (0) +static inline void +RelationCloseSmgr(Relation relation) +{ + if (relation->rd_smgr != NULL) + smgrclose(relation->rd_smgr); + + /* smgrclose should unhook from owner pointer */ + Assert(relation->rd_smgr == NULL); +} +#endif /* !FRONTEND */ /* * RelationGetTargetBlock