Fix macros that were not properly surrounded by parens or braces.

2 files changed, 95 insertions, 91 deletions

diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index bb0adff867..47ce6a8b6e 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.27 1998/04/26 04:08:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.28 1998/06/15 18:39:40 momjian Exp $
  *
  * Notes:
  *		XXX This needs to use exception.h to handle recovery when
@@ -96,13 +96,17 @@ static long eqproc[] = {
  */
 #ifdef CACHEDEBUG
 #define CatalogCacheInitializeCache_DEBUG1 \
+do { \
 	elog(DEBUG, "CatalogCacheInitializeCache: cache @%08lx", cache); \
 	if (relation) \
 		elog(DEBUG, "CatalogCacheInitializeCache: called w/relation(inval)"); \
 	else \
 		elog(DEBUG, "CatalogCacheInitializeCache: called w/relname %s", \
-			cache->cc_relname)
+			cache->cc_relname) \
+} while(0)
+			
 #define CatalogCacheInitializeCache_DEBUG2 \
+do { \
 		if (cache->cc_key[i] > 0) { \
 			elog(DEBUG, "CatalogCacheInitializeCache: load %d/%d w/%d, %d", \
 				i+1, cache->cc_nkeys, cache->cc_key[i], \
@@ -110,7 +114,9 @@ static long eqproc[] = {
 		} else { \
 			elog(DEBUG, "CatalogCacheInitializeCache: load %d/%d w/%d", \
 				i+1, cache->cc_nkeys, cache->cc_key[i]); \
-		}
+		} \
+} while(0)
+
 #else
 #define CatalogCacheInitializeCache_DEBUG1
 #define CatalogCacheInitializeCache_DEBUG2
@@ -654,16 +660,20 @@ SystemCacheRelationFlushed(Oid relId)
  */
 #ifdef CACHEDEBUG
 #define InitSysCache_DEBUG1 \
-elog(DEBUG, "InitSysCache: rid=%d id=%d nkeys=%d size=%d\n", \
-	 cp->relationId, cp->id, cp->cc_nkeys, cp->cc_size); \
-	for (i = 0; i < nkeys; i += 1) { \
-										 elog(DEBUG, "InitSysCache: key=%d len=%d skey=[%d %d %d %d]\n", \
-											  cp->cc_key[i], cp->cc_klen[i], \
-											  cp->cc_skey[i].sk_flags, \
-											  cp->cc_skey[i].sk_attno, \
-											  cp->cc_skey[i].sk_procedure, \
-											  cp->cc_skey[i].sk_argument); \
-											  }
+do { \
+	elog(DEBUG, "InitSysCache: rid=%d id=%d nkeys=%d size=%d\n", \
+		cp->relationId, cp->id, cp->cc_nkeys, cp->cc_size); \
+	for (i = 0; i < nkeys; i += 1) \
+	{ \
+		elog(DEBUG, "InitSysCache: key=%d len=%d skey=[%d %d %d %d]\n", \
+			 cp->cc_key[i], cp->cc_klen[i], \
+			 cp->cc_skey[i].sk_flags, \
+			 cp->cc_skey[i].sk_attno, \
+			 cp->cc_skey[i].sk_procedure, \
+			 cp->cc_skey[i].sk_argument); \
+	} \
+} while(0)
+											  
 #else
 #define InitSysCache_DEBUG1
 #endif
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 9776bcd9bf..3fe7de4c32 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.38 1998/04/27 04:07:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.39 1998/06/15 18:39:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -157,86 +157,80 @@ typedef struct relnamecacheent
  * -----------------
  */
 #define RelationCacheInsert(RELATION)	\
-	{	RelIdCacheEnt *idhentry; RelNameCacheEnt *namehentry; \
-		char *relname; Oid reloid; bool found; \
-		relname = (RELATION->rd_rel->relname).data; \
-		namehentry = (RelNameCacheEnt*)hash_search(RelationNameCache, \
-												   relname, \
-												   HASH_ENTER, \
-												   &found); \
-		if (namehentry == NULL) { \
-			elog(FATAL, "can't insert into relation descriptor cache"); \
-		  } \
-		if (found && !IsBootstrapProcessingMode()) { \
-			/* used to give notice -- now just keep quiet */ ; \
-		  } \
-		namehentry->reldesc = RELATION; \
-		reloid = RELATION->rd_id; \
-		idhentry = (RelIdCacheEnt*)hash_search(RelationIdCache, \
-											   (char *)&reloid, \
+do { \
+	RelIdCacheEnt *idhentry; RelNameCacheEnt *namehentry; \
+	char *relname; Oid reloid; bool found; \
+	relname = (RELATION->rd_rel->relname).data; \
+	namehentry = (RelNameCacheEnt*)hash_search(RelationNameCache, \
+											   relname, \
 											   HASH_ENTER, \
 											   &found); \
-		if (idhentry == NULL) { \
-			elog(FATAL, "can't insert into relation descriptor cache"); \
-		  } \
-		if (found && !IsBootstrapProcessingMode()) { \
-			/* used to give notice -- now just keep quiet */ ; \
-		  } \
-		idhentry->reldesc = RELATION; \
-	}
+	if (namehentry == NULL) \
+		elog(FATAL, "can't insert into relation descriptor cache"); \
+	if (found && !IsBootstrapProcessingMode()) \
+		/* used to give notice -- now just keep quiet */ ; \
+	namehentry->reldesc = RELATION; \
+	reloid = RELATION->rd_id; \
+	idhentry = (RelIdCacheEnt*)hash_search(RelationIdCache, \
+										   (char *)&reloid, \
+										   HASH_ENTER, \
+										   &found); \
+	if (idhentry == NULL) \
+		elog(FATAL, "can't insert into relation descriptor cache"); \
+	if (found && !IsBootstrapProcessingMode()) \
+		/* used to give notice -- now just keep quiet */ ; \
+	idhentry->reldesc = RELATION; \
+} while(0)
+
 #define RelationNameCacheLookup(NAME, RELATION) \
-	{	RelNameCacheEnt *hentry; bool found; \
-		hentry = (RelNameCacheEnt*)hash_search(RelationNameCache, \
-											   (char *)NAME,HASH_FIND,&found); \
-		if (hentry == NULL) { \
-			elog(FATAL, "error in CACHE"); \
-		  } \
-		if (found) { \
-			RELATION = hentry->reldesc; \
-		  } \
-		else { \
-			RELATION = NULL; \
-		  } \
-	}
-#define RelationIdCacheLookup(ID, RELATION)		\
-	{	RelIdCacheEnt *hentry; bool found; \
-		hentry = (RelIdCacheEnt*)hash_search(RelationIdCache, \
-											 (char *)&(ID),HASH_FIND, &found); \
-		if (hentry == NULL) { \
-			elog(FATAL, "error in CACHE"); \
-		  } \
-		if (found) { \
-			RELATION = hentry->reldesc; \
-		  } \
-		else { \
-			RELATION = NULL; \
-		  } \
-	}
-#define RelationCacheDelete(RELATION)	\
-	{	RelNameCacheEnt *namehentry; RelIdCacheEnt *idhentry; \
-		char *relname; Oid reloid; bool found; \
-		relname = (RELATION->rd_rel->relname).data; \
-		namehentry = (RelNameCacheEnt*)hash_search(RelationNameCache, \
-												   relname, \
-												   HASH_REMOVE, \
-												   &found); \
-		if (namehentry == NULL) { \
-			elog(FATAL, "can't delete from relation descriptor cache"); \
-		  } \
-		if (!found) { \
-			elog(NOTICE, "trying to delete a reldesc that does not exist."); \
-		  } \
-		reloid = RELATION->rd_id; \
-		idhentry = (RelIdCacheEnt*)hash_search(RelationIdCache, \
-											   (char *)&reloid, \
-											   HASH_REMOVE, &found); \
-		if (idhentry == NULL) { \
-			elog(FATAL, "can't delete from relation descriptor cache"); \
-		  } \
-		if (!found) { \
-			elog(NOTICE, "trying to delete a reldesc that does not exist."); \
-		  } \
-	}
+do { \
+	RelNameCacheEnt *hentry; bool found; \
+	hentry = (RelNameCacheEnt*)hash_search(RelationNameCache, \
+										   (char *)NAME,HASH_FIND,&found); \
+	if (hentry == NULL) \
+		elog(FATAL, "error in CACHE"); \
+	if (found) \
+		RELATION = hentry->reldesc; \
+	else \
+		RELATION = NULL; \
+} while(0)
+
+#define RelationIdCacheLookup(ID, RELATION)	\
+do { \
+	RelIdCacheEnt *hentry; \
+	bool found; \
+	hentry = (RelIdCacheEnt*)hash_search(RelationIdCache, \
+										 (char *)&(ID),HASH_FIND, &found); \
+	if (hentry == NULL) \
+		elog(FATAL, "error in CACHE"); \
+	if (found) \
+		RELATION = hentry->reldesc; \
+	else \
+		RELATION = NULL; \
+} while(0)
+
+#define RelationCacheDelete(RELATION) \
+do { \
+	RelNameCacheEnt *namehentry; RelIdCacheEnt *idhentry; \
+	char *relname; Oid reloid; bool found; \
+	relname = (RELATION->rd_rel->relname).data; \
+	namehentry = (RelNameCacheEnt*)hash_search(RelationNameCache, \
+											   relname, \
+											   HASH_REMOVE, \
+											   &found); \
+	if (namehentry == NULL) \
+		elog(FATAL, "can't delete from relation descriptor cache"); \
+	if (!found) \
+		elog(NOTICE, "trying to delete a reldesc that does not exist."); \
+	reloid = RELATION->rd_id; \
+	idhentry = (RelIdCacheEnt*)hash_search(RelationIdCache, \
+										   (char *)&reloid, \
+										   HASH_REMOVE, &found); \
+	if (idhentry == NULL) \
+		elog(FATAL, "can't delete from relation descriptor cache"); \
+	if (!found) \
+		elog(NOTICE, "trying to delete a reldesc that does not exist."); \
+} while(0)
 
 /* non-export function prototypes */
 static void