diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-06-15 18:40:05 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-06-15 18:40:05 +0000 |
| commit | 27db9ecd0b15abca733a99dab3bf9771ad70507d (patch) | |
| tree | 047acdb5eca8e9b5c904c7285f9fdc81b4e527c2 /src/backend/utils/cache/catcache.c | |
| parent | 3af536a15b64b9cfd8464af2032ccf5e66e79439 (diff) | |
| download | postgresql-27db9ecd0b15abca733a99dab3bf9771ad70507d.tar.gz postgresql-27db9ecd0b15abca733a99dab3bf9771ad70507d.zip | |
Fix macros that were not properly surrounded by parens or braces.
Diffstat (limited to 'src/backend/utils/cache/catcache.c')
| -rw-r--r-- | src/backend/utils/cache/catcache.c | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index bb0adff8678..47ce6a8b6ea 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 |