aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/cache/syscache.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1998-06-15 19:30:31 +0000
committerBruce Momjian <bruce@momjian.us>1998-06-15 19:30:31 +0000
commit6bd323c6b3f65b26273d5efb7ddd0ac04d039546 (patch)
tree6106db4e7512e765ca8c48963fb750cb63fec96f /src/backend/utils/cache/syscache.c
parent27db9ecd0b15abca733a99dab3bf9771ad70507d (diff)
downloadpostgresql-6bd323c6b3f65b26273d5efb7ddd0ac04d039546.tar.gz
postgresql-6bd323c6b3f65b26273d5efb7ddd0ac04d039546.zip
Remove un-needed braces around single statements.
Diffstat (limited to 'src/backend/utils/cache/syscache.c')
-rw-r--r--src/backend/utils/cache/syscache.c42
1 files changed, 15 insertions, 27 deletions
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 480a913e9d9..0348fa3481a 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.17 1998/05/09 23:45:29 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.18 1998/06/15 19:29:40 momjian Exp $
*
* NOTES
* These routines allow the parser/planner/executor to perform
@@ -406,30 +406,22 @@ SearchSysCacheTuple(int cacheId,/* cache selection code */
return ((HeapTuple) NULL);
}
- if (!AMI_OVERRIDE)
- {
- Assert(PointerIsValid(SysCache[cacheId]));
- }
- else
+ Assert(AMI_OVERRIDE || PointerIsValid(SysCache[cacheId]));
+
+ if (!PointerIsValid(SysCache[cacheId]))
{
+ SysCache[cacheId] =
+ InitSysCache(cacheinfo[cacheId].name,
+ cacheinfo[cacheId].indname,
+ cacheId,
+ cacheinfo[cacheId].nkeys,
+ cacheinfo[cacheId].key,
+ cacheinfo[cacheId].iScanFunc);
if (!PointerIsValid(SysCache[cacheId]))
- {
- SysCache[cacheId] =
- InitSysCache(cacheinfo[cacheId].name,
- cacheinfo[cacheId].indname,
- cacheId,
- cacheinfo[cacheId].nkeys,
- cacheinfo[cacheId].key,
- cacheinfo[cacheId].iScanFunc);
- if (!PointerIsValid(SysCache[cacheId]))
- {
- elog(ERROR,
- "InitCatalogCache: Can't init cache %.16s(%d)",
- cacheinfo[cacheId].name,
- cacheId);
- }
-
- }
+ elog(ERROR,
+ "InitCatalogCache: Can't init cache %.16s(%d)",
+ cacheinfo[cacheId].name,
+ cacheId);
}
tp = SearchSysCache(SysCache[cacheId], key1, key2, key3, key4);
@@ -559,9 +551,7 @@ SearchSysCacheGetAttribute(int cacheId,
}
if (attributeByValue)
- {
returnValue = (void *) attributeValue;
- }
else
{
char *tmp;
@@ -662,9 +652,7 @@ TypeDefaultRetrieve(Oid typId)
returnValue = (void *) i32;
}
else
- {
returnValue = NULL;
- }
}
else
{